Fixed a bunch of warnings
4 files changed