fix some go vet complaints