Fix a couple go vet discovered issues