Fix "go vet" problems