Fix up golint errors