Fixes to Compiler class, found while making tests