Random go vet fixes