Fixes yet more overhaul errors

Still fails unit tests.