Fix stuff reported from go-lint