Fixing even more errors