Fixed a few more errors