Fixes recommended by go vet