Fix go vet complaints