Fixing some more errors