go vet fixes