Fix up more errors