fixes for gcc 4.x

5 files changed