More fixes
Go fixes