Fix a couple of issues raised by go vet