Some small fixes from 'go vet' and 'golint'