Fixed a few compilation warnings

7 files changed