Merge pull request #358 from am11/master

Compiler: Various compiler fixes