diff --git a/packages/builder/src/mrl/providers/wormhole/extrinsic/polkadotXcm/polkadotXcm.ts b/packages/builder/src/mrl/providers/wormhole/extrinsic/polkadotXcm/polkadotXcm.ts
index f4c34a1e..a7e7cee7 100644
--- a/packages/builder/src/mrl/providers/wormhole/extrinsic/polkadotXcm/polkadotXcm.ts
+++ b/packages/builder/src/mrl/providers/wormhole/extrinsic/polkadotXcm/polkadotXcm.ts
@@ -71,11 +71,14 @@ export function polkadotXcm() {
         const feeAssetTransferTx = transfer(
           ...builder
             .build({
-              asset: AssetAmount.fromChainAsset(moonAsset, {
-                amount: CROSS_CHAIN_FEE + BUY_EXECUTION_FEE,
-              }),
+              asset: AssetAmount.fromChainAsset(
+                source.getChainAsset(moonAsset),
+                {
+                  amount: CROSS_CHAIN_FEE + BUY_EXECUTION_FEE,
+                },
+              ),
               destination: moonChain,
-              destinationAddress,
+              destinationAddress: computedOriginAccount,
               destinationApi: moonApi,
               fee,
               source: source as AnyParachain,
diff --git a/packages/mrl/src/getTransferData/getTransferData.utils.ts b/packages/mrl/src/getTransferData/getTransferData.utils.ts
index a4568260..a76bed5b 100644
--- a/packages/mrl/src/getTransferData/getTransferData.utils.ts
+++ b/packages/mrl/src/getTransferData/getTransferData.utils.ts
@@ -36,7 +36,7 @@ import {
 import type { MoonChainTransferData } from '../mrl.interfaces';
 
 const MOON_CHAIN_AUTOMATIC_GAS_ESTIMATION = {
-  [moonbeam.key]: 657226n,
+  [moonbeam.key]: 1273110n,
   [moonbaseAlpha.key]: 1271922n,
 };
 
@@ -58,7 +58,6 @@ export function getMoonChainFeeValueOnSource({
   const isSameAssetPayingMoonChainFee = sourceData.balance.isSame(
     moonChainData.fee,
   );
-
   return !isDestinationMoonChain &&
     isSourceParachain &&
     isSameAssetPayingMoonChainFee
@@ -125,7 +124,7 @@ export async function buildTransfer({
     destinationAddress,
     destinationApi,
     fee: destinationFee,
-    isAutomatic: route.mrl.isAutomatic,
+    isAutomatic: route.mrl.isAutomatic, // TODO
     moonApi,
     moonAsset: moonChain.nativeAsset,
     moonChain,