Fix lint and vet errors