Compiler Bugs fixed