More fixes. Go now compiles (doesn't pass tests yet though)