More warning fixes
8 files changed