diff --git a/src/core/TroveManager.sol b/src/core/TroveManager.sol
index 15dd675..92430fc 100644
--- a/src/core/TroveManager.sol
+++ b/src/core/TroveManager.sol
@@ -842,7 +842,7 @@ contract TroveManager is ITroveManager, Initializable, OwnableUpgradeable {
         _updateIntegrals(_borrower, 0, supply);
 
         totalActiveCollateral = totalActiveCollateral + _collateralAmount;
-        uint256 _newTotalDebt = supply + _compositeDebt;
+        uint256 _newTotalDebt = totalActiveDebt + _compositeDebt;
         require(_newTotalDebt + defaultedDebt <= maxSystemDebt, "Collateral debt limit reached");
         totalActiveDebt = _newTotalDebt;
         emit TroveUpdated(_borrower, _compositeDebt, _collateralAmount, stake, TroveManagerOperation.open);
diff --git a/src/core/facets/FactoryFacet.sol b/src/core/facets/FactoryFacet.sol
index a508335..e7ae621 100644
--- a/src/core/facets/FactoryFacet.sol
+++ b/src/core/facets/FactoryFacet.sol
@@ -86,6 +86,7 @@ contract FactoryFacet is IFactoryFacet, AccessControlInternal {
             }
         }
         if (!collateralEnabled) {
+            /*
             Queue memory queueCached = s.queue;
             if (queueCached.nextSunsetIndexKey > queueCached.firstSunsetIndexKey) {
                 SunsetIndex memory sIdx = s.sunsetIndexes[queueCached.firstSunsetIndexKey];
@@ -95,6 +96,7 @@ contract FactoryFacet is IFactoryFacet, AccessControlInternal {
                     return;
                 }
             }
+            */
             s.collateralTokens.push(_collateral);
             s.indexByCollateral[_collateral] = s.collateralTokens.length;
         } else {