Compiler suggested fixes
6 files changed