Fixes more instance errors