Cleanup and fix of compiler.