Fix issues discovered with go vet