More Compiler Error Fixes