Fixes instance errors

Still fails unit tests.