Fix errors reported by 'go vet'