Removed some more errors