Fixes for `go vet`