Fix go vet issues