Fixed issues exposed by 'go vet'