Fix Go Vet errors