Fix some other bugs
Merge branch 'master' of http://github.com/minmell/minihaskell