Fix issues reported by the go.tools vet command