Fix some gcc-4 warnings
4 files changed