Fix a few formatting errors found by go vet