Some trivial fixes from "go vet" and "golint"