Fix some more errors.