Removing a few more warnings
8 files changed