more compiler fixes
Merge pull request #37 from Obvious/nick-compiler

more compiler fixes