Compiler: Fix some inconsistencies with master