Compiler errors fixed