Fixing go vet issues