Minor fixes

Go 1658