Fixes to Compiler module.