Fix Compiler Errors