Cleaned up a few compile complaints
4 files changed