Fixes for gofmt and vet