Fixed some more errors