Fixes yet more instance errors