Fixed "go vet" Failures