Compile fixes
8 files changed