Fixing even more mistakes