Fix some more errors