Merge related compile fixes
3 files changed