Minor fixes and a run of go fmt