Changes to quiet some gcc warnings
5 files changed