Fixes for go vet