Fixed for Compiler indicated bugs
2 files changed