go-lint fixes