Fixes from go vet