diff --git a/lcov.info b/lcov.info
index 9959cab..b1af8cc 100644
--- a/lcov.info
+++ b/lcov.info
@@ -56,9 +56,9 @@ BRH:0
 end_of_record
 TN:
 SF:script/DeployFulfillmentVault.s.sol
-DA:17,875
+DA:17,876
 FN:17,DeployFulfillmentVaultScript.setUp
-FNDA:875,DeployFulfillmentVaultScript.setUp
+FNDA:876,DeployFulfillmentVaultScript.setUp
 DA:18,0
 DA:19,0
 DA:20,90
@@ -66,10 +66,10 @@ DA:21,90
 DA:22,0
 DA:23,0
 DA:24,0
-DA:25,357
+DA:25,358
 DA:26,0
 DA:27,0
-DA:28,875
+DA:28,876
 DA:31,3605
 FN:31,DeployFulfillmentVaultScript.run
 FNDA:3605,DeployFulfillmentVaultScript.run
@@ -86,7 +86,7 @@ DA:56,2151
 DA:59,2151
 FN:59,DeployFulfillmentVaultScript.logFulfillmentVault
 FNDA:2151,DeployFulfillmentVaultScript.logFulfillmentVault
-DA:60,773
+DA:60,257
 FNF:4
 FNH:4
 LF:23
@@ -265,22 +265,26 @@ FN:219,FulfillmentVault.bridgeAssetFromEvmToCore
 FNDA:0,FulfillmentVault.bridgeAssetFromEvmToCore
 DA:220,0
 DA:221,0
-DA:225,0
-FN:225,FulfillmentVault.tradeOnCore
+BRDA:221,0,0,-
+BRDA:221,0,1,-
+DA:222,0
+DA:224,0
+DA:229,0
+FN:229,FulfillmentVault.tradeOnCore
 FNDA:0,FulfillmentVault.tradeOnCore
-DA:232,0
-DA:234,0
 DA:236,0
-DA:237,0
+DA:238,0
+DA:240,0
 DA:241,0
-FN:241,FulfillmentVault.fillOrder
-FNDA:0,FulfillmentVault.fillOrder
-DA:242,0
-DA:243,0
-DA:244,0
 DA:245,0
+FN:245,FulfillmentVault.fillOrder
+FNDA:0,FulfillmentVault.fillOrder
+DA:246,0
 DA:247,0
 DA:248,0
+DA:249,0
+DA:251,0
+DA:252,0
 DA:54,773
 FN:54,FulfillmentVault._getFulfillmentVaultStorage
 FNDA:773,FulfillmentVault._getFulfillmentVaultStorage
@@ -375,28 +379,32 @@ FN:219,FulfillmentVault.bridgeAssetFromEvmToCore
 FNDA:772,FulfillmentVault.bridgeAssetFromEvmToCore
 DA:220,258
 DA:221,258
-DA:225,773
-FN:225,FulfillmentVault.tradeOnCore
+BRDA:221,0,0,-
+BRDA:221,0,1,258
+DA:222,0
+DA:224,258
+DA:229,773
+FN:229,FulfillmentVault.tradeOnCore
 FNDA:773,FulfillmentVault.tradeOnCore
-DA:232,0
-DA:234,259
-DA:236,259
-DA:237,259
-DA:241,515
-FN:241,FulfillmentVault.fillOrder
+DA:236,0
+DA:238,259
+DA:240,259
+DA:241,259
+DA:245,515
+FN:245,FulfillmentVault.fillOrder
 FNDA:515,FulfillmentVault.fillOrder
-DA:242,1
-DA:243,1
-DA:244,1
-DA:245,1
+DA:246,1
 DA:247,1
 DA:248,1
+DA:249,1
+DA:251,1
+DA:252,1
 FNF:42
 FNH:21
-LF:136
-LH:66
-BRF:0
-BRH:0
+LF:140
+LH:67
+BRF:4
+BRH:1
 end_of_record
 TN:
 SF:src/LiquidityVault.sol
@@ -977,126 +985,126 @@ BRDA:201,4,0,-
 BRDA:201,4,1,-
 DA:202,0
 DA:204,0
-DA:206,0
 DA:207,0
 DA:208,0
 DA:209,0
-DA:213,0
-DA:215,0
+DA:210,0
+DA:214,0
 DA:216,0
 DA:217,0
 DA:218,0
 DA:219,0
 DA:220,0
-BRDA:220,5,0,-
 DA:221,0
-DA:230,0
-FN:230,Router.updatePriceFeedsAndRequestMortgage
+BRDA:221,5,0,-
+DA:222,0
+DA:231,0
+FN:231,Router.updatePriceFeedsAndRequestMortgage
 FNDA:0,Router.updatePriceFeedsAndRequestMortgage
-DA:242,0
-DA:245,0
-DA:247,0
-DA:253,0
-FN:253,Router.requestMortgage
+DA:243,0
+DA:246,0
+DA:248,0
+DA:254,0
+FN:254,Router.requestMortgage
 FNDA:0,Router.requestMortgage
-DA:263,0
-DA:265,0
-BRDA:265,6,0,-
+DA:264,0
 DA:266,0
-BRDA:266,7,0,-
+BRDA:266,6,0,-
 DA:267,0
-DA:269,0
-DA:272,0
-BRDA:272,8,0,-
+BRDA:267,7,0,-
+DA:268,0
+DA:270,0
 DA:273,0
-BRDA:273,9,0,-
+BRDA:273,8,0,-
 DA:274,0
-DA:276,0
-DA:279,0
+BRDA:274,9,0,-
+DA:275,0
+DA:277,0
 DA:280,0
-DA:283,0
-DA:289,0
-FN:289,Router.periodPay
+DA:281,0
+DA:284,0
+DA:290,0
+FN:290,Router.periodPay
 FNDA:0,Router.periodPay
-DA:291,0
-DA:294,0
-DA:297,0
+DA:292,0
+DA:295,0
 DA:298,0
 DA:299,0
-DA:305,0
-FN:305,Router.penaltyPay
+DA:300,0
+DA:306,0
+FN:306,Router.penaltyPay
 FNDA:0,Router.penaltyPay
-DA:307,0
-DA:310,0
-DA:313,0
+DA:308,0
+DA:311,0
 DA:314,0
 DA:315,0
-DA:321,0
-FN:321,Router.refinance
+DA:316,0
+DA:322,0
+FN:322,Router.refinance
 FNDA:0,Router.refinance
-DA:323,0
-DA:326,0
-DA:329,0
-DA:332,0
-DA:335,0
-DA:338,0
-DA:341,0
+DA:324,0
+DA:327,0
+DA:330,0
+DA:333,0
+DA:336,0
+DA:339,0
 DA:342,0
-DA:345,0
-DA:353,0
-FN:353,Router._getOrCreateOriginationPool
+DA:343,0
+DA:346,0
+DA:354,0
+FN:354,Router._getOrCreateOriginationPool
 FNDA:0,Router._getOrCreateOriginationPool
+DA:355,0
 DA:357,0
-DA:360,0
-BRDA:360,10,0,-
-DA:368,0
-FN:368,Router.originationPoolDeposit
+BRDA:357,10,0,-
+DA:365,0
+FN:365,Router.originationPoolDeposit
 FNDA:0,Router.originationPoolDeposit
+DA:367,0
 DA:370,0
 DA:373,0
 DA:376,0
-DA:379,0
+DA:377,0
 DA:380,0
-DA:383,0
-DA:389,0
-FN:389,Router.convert
+DA:386,0
+FN:386,Router.convert
 FNDA:0,Router.convert
-DA:395,0
-BRDA:395,11,0,-
-BRDA:395,11,1,-
+DA:392,0
+BRDA:392,11,0,-
+BRDA:392,11,1,-
+DA:393,0
 DA:396,0
-DA:399,0
-BRDA:399,12,0,-
-BRDA:399,12,1,-
+BRDA:396,12,0,-
+BRDA:396,12,1,-
+DA:398,0
 DA:401,0
-DA:404,0
-BRDA:404,13,0,-
-BRDA:404,13,1,-
+BRDA:401,13,0,-
+BRDA:401,13,1,-
+DA:402,0
 DA:405,0
-DA:408,0
-BRDA:408,14,0,-
-BRDA:408,14,1,-
-DA:409,0
-DA:413,0
-DA:420,0
-FN:420,Router.wrap
+BRDA:405,14,0,-
+BRDA:405,14,1,-
+DA:406,0
+DA:410,0
+DA:417,0
+FN:417,Router.wrap
 FNDA:0,Router.wrap
+DA:419,0
+BRDA:419,15,0,-
+BRDA:419,15,1,-
+DA:420,0
+DA:421,0
+BRDA:421,16,0,-
 DA:422,0
-BRDA:422,15,0,-
-BRDA:422,15,1,-
-DA:423,0
-DA:424,0
-BRDA:424,16,0,-
 DA:425,0
 DA:428,0
-DA:431,0
-BRDA:431,17,0,-
-DA:432,0
-DA:436,0
-BRDA:436,18,0,-
-DA:438,0
-DA:440,0
-DA:444,0
+BRDA:428,17,0,-
+DA:429,0
+DA:433,0
+BRDA:433,18,0,-
+DA:435,0
+DA:437,0
+DA:441,0
 DA:68,8
 FN:68,Router.constructor
 FNDA:8,Router.constructor
@@ -1168,126 +1176,126 @@ BRDA:201,4,0,2
 BRDA:201,4,1,4
 DA:202,2
 DA:204,2
-DA:206,2
 DA:207,2
-DA:208,0
-DA:209,2
-DA:213,4
-DA:215,4
+DA:208,2
+DA:209,0
+DA:210,2
+DA:214,4
 DA:216,4
 DA:217,4
 DA:218,4
 DA:219,4
 DA:220,4
-BRDA:220,5,0,-
-DA:221,0
-DA:230,0
-FN:230,Router.updatePriceFeedsAndRequestMortgage
+DA:221,4
+BRDA:221,5,0,-
+DA:222,0
+DA:231,0
+FN:231,Router.updatePriceFeedsAndRequestMortgage
 FNDA:0,Router.updatePriceFeedsAndRequestMortgage
-DA:242,0
-DA:245,0
-DA:247,0
-DA:253,3
-FN:253,Router.requestMortgage
+DA:243,0
+DA:246,0
+DA:248,0
+DA:254,3
+FN:254,Router.requestMortgage
 FNDA:3,Router.requestMortgage
-DA:263,3
-DA:265,3
-BRDA:265,6,0,1
-DA:266,1
-BRDA:266,7,0,-
-DA:267,0
-DA:269,1
-DA:272,3
-BRDA:272,8,0,2
-DA:273,2
-BRDA:273,9,0,-
-DA:274,0
-DA:276,2
-DA:279,3
+DA:264,3
+DA:266,3
+BRDA:266,6,0,1
+DA:267,1
+BRDA:267,7,0,-
+DA:268,0
+DA:270,1
+DA:273,3
+BRDA:273,8,0,2
+DA:274,2
+BRDA:274,9,0,-
+DA:275,0
+DA:277,2
 DA:280,3
-DA:283,3
-DA:289,0
-FN:289,Router.periodPay
+DA:281,3
+DA:284,3
+DA:290,0
+FN:290,Router.periodPay
 FNDA:0,Router.periodPay
-DA:291,0
-DA:294,0
-DA:297,0
+DA:292,0
+DA:295,0
 DA:298,0
 DA:299,0
-DA:305,0
-FN:305,Router.penaltyPay
+DA:300,0
+DA:306,0
+FN:306,Router.penaltyPay
 FNDA:0,Router.penaltyPay
-DA:307,0
-DA:310,0
-DA:313,0
+DA:308,0
+DA:311,0
 DA:314,0
 DA:315,0
-DA:321,0
-FN:321,Router.refinance
+DA:316,0
+DA:322,0
+FN:322,Router.refinance
 FNDA:0,Router.refinance
-DA:323,0
-DA:326,0
-DA:329,0
-DA:332,0
-DA:335,0
-DA:338,0
-DA:341,0
+DA:324,0
+DA:327,0
+DA:330,0
+DA:333,0
+DA:336,0
+DA:339,0
 DA:342,0
-DA:345,0
-DA:353,1
-FN:353,Router._getOrCreateOriginationPool
+DA:343,0
+DA:346,0
+DA:354,1
+FN:354,Router._getOrCreateOriginationPool
 FNDA:1,Router._getOrCreateOriginationPool
+DA:355,1
 DA:357,1
-DA:360,1
-BRDA:360,10,0,-
-DA:368,1
-FN:368,Router.originationPoolDeposit
+BRDA:357,10,0,-
+DA:365,1
+FN:365,Router.originationPoolDeposit
 FNDA:1,Router.originationPoolDeposit
+DA:367,1
 DA:370,1
 DA:373,1
 DA:376,1
-DA:379,1
+DA:377,1
 DA:380,1
-DA:383,1
-DA:389,2
-FN:389,Router.convert
+DA:386,2
+FN:386,Router.convert
 FNDA:2,Router.convert
-DA:395,3
-BRDA:395,11,0,-
-BRDA:395,11,1,1
-DA:396,0
-DA:399,3
-BRDA:399,12,0,-
-BRDA:399,12,1,1
-DA:401,0
-DA:404,3
-BRDA:404,13,0,-
-BRDA:404,13,1,1
-DA:405,0
-DA:408,3
-BRDA:408,14,0,2
-BRDA:408,14,1,1
-DA:409,2
-DA:413,1
-DA:420,0
-FN:420,Router.wrap
+DA:392,3
+BRDA:392,11,0,-
+BRDA:392,11,1,1
+DA:393,0
+DA:396,3
+BRDA:396,12,0,-
+BRDA:396,12,1,1
+DA:398,0
+DA:401,3
+BRDA:401,13,0,-
+BRDA:401,13,1,1
+DA:402,0
+DA:405,3
+BRDA:405,14,0,2
+BRDA:405,14,1,1
+DA:406,2
+DA:410,1
+DA:417,0
+FN:417,Router.wrap
 FNDA:0,Router.wrap
+DA:419,0
+BRDA:419,15,0,-
+BRDA:419,15,1,-
+DA:420,0
+DA:421,0
+BRDA:421,16,0,-
 DA:422,0
-BRDA:422,15,0,-
-BRDA:422,15,1,-
-DA:423,0
-DA:424,0
-BRDA:424,16,0,-
 DA:425,0
 DA:428,0
-DA:431,0
-BRDA:431,17,0,-
-DA:432,0
-DA:436,0
-BRDA:436,18,0,-
-DA:438,0
-DA:440,0
-DA:444,0
+BRDA:428,17,0,-
+DA:429,0
+DA:433,0
+BRDA:433,18,0,-
+DA:435,0
+DA:437,0
+DA:441,0
 FNF:34
 FNH:13
 LF:258
diff --git a/src/FulfillmentVault.sol b/src/FulfillmentVault.sol
index 5e0bf41..3799178 100644
--- a/src/FulfillmentVault.sol
+++ b/src/FulfillmentVault.sol
@@ -218,7 +218,11 @@ contract FulfillmentVault is LiquidityVault, IFulfillmentVault {
   /// @inheritdoc IFulfillmentVault
   function bridgeAssetFromEvmToCore(address asset, uint256 amount) external override onlyRole(KEEPER_ROLE) whenPaused {
     emit AssetBridgedFromEvmToCore(asset, amount);
-    CoreWriterLib.bridgeToCore(asset, amount);
+    if (asset == address(0)) {
+      CoreWriterLib.bridgeToCore(uint64(150), amount);
+    } else {
+      CoreWriterLib.bridgeToCore(asset, amount);
+    }
   }
 
   /// @inheritdoc IFulfillmentVault
diff --git a/src/RolloverVault.sol b/src/RolloverVault.sol
index 5b90f6b..4383dd1 100644
--- a/src/RolloverVault.sol
+++ b/src/RolloverVault.sol
@@ -132,7 +132,7 @@ contract RolloverVault is LiquidityVault, IRolloverVault {
       uint256 ogPoolConsolBalance = IERC20(consol()).balanceOf(address(ogPool));
       uint256 ogPoolBalance = ogPool.balanceOf(address(this));
       total += Math.mulDiv(ogPoolBalance, ogPoolUsdxBalance, ogPoolTotalSupply)
-        + Math.mulDiv(ogPoolBalance, ogPoolConsolBalance, ogPoolTotalSupply);
+      + Math.mulDiv(ogPoolBalance, ogPoolConsolBalance, ogPoolTotalSupply);
     }
     // Add the USDX and Consol balances that are currently in the rollover vault
     total += IERC20(usdx()).balanceOf(address(this)) + IERC20(consol()).balanceOf(address(this));
diff --git a/src/Router.sol b/src/Router.sol
index 0ff0035..c6ccba6 100644
--- a/src/Router.sol
+++ b/src/Router.sol
@@ -201,14 +201,13 @@ contract Router is
     if (creationRequest.base.isCompounding) {
       for (uint256 i = 0; i < creationRequest.base.originationPools.length; i++) {
         // If compounding, need to collect 1/2 of the collateral amount + commission fee (this is in the form of collateral)
-        collateralCollected += IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(
-          (creationRequest.base.collateralAmounts[i] + 1) / 2
-        );
+        collateralCollected += IOriginationPool(creationRequest.base.originationPools[i])
+          .calculateReturnAmount((creationRequest.base.collateralAmounts[i] + 1) / 2);
         (uint256 _cost, uint8 _collateralDecimals) =
           _calculateCost(creationRequest.collateral, creationRequest.base.collateralAmounts[i] / 2);
         collateralDecimals = _collateralDecimals;
-        paymentAmount +=
-          (2 * _cost) - IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(_cost);
+        paymentAmount += (2 * _cost)
+          - IOriginationPool(creationRequest.base.originationPools[i]).calculateReturnAmount(_cost);
       }
     } else {
       for (uint256 i = 0; i < creationRequest.base.originationPools.length; i++) {
@@ -351,9 +350,13 @@ contract Router is
    * @param oPoolConfigId The OPoolConfigId of the origination pool config
    * @return originationPool The origination pool
    */
-  function _getOrCreateOriginationPool(OPoolConfigId oPoolConfigId) internal returns (IOriginationPool originationPool) {
-    originationPool =
-      IOriginationPool(IOriginationPoolScheduler(originationPoolScheduler).predictOriginationPool(oPoolConfigId));
+  function _getOrCreateOriginationPool(OPoolConfigId oPoolConfigId)
+    internal
+    returns (IOriginationPool originationPool)
+  {
+    originationPool = IOriginationPool(
+      IOriginationPoolScheduler(originationPoolScheduler).predictOriginationPool(oPoolConfigId)
+    );
     if (!IOriginationPoolScheduler(originationPoolScheduler).isRegistered(address(originationPool))) {
       IOriginationPool(IOriginationPoolScheduler(originationPoolScheduler).deployOriginationPool(oPoolConfigId));
     }