fixes to remove warnings from gcc-4.0.0
5 files changed