Fixes for problems found by go vet