Fix go vet suggestions