Compiler cleanup for issues noticed during x64 compiles
7 files changed