diff --git a/Cargo.toml b/Cargo.toml
index 9123632516..e1e3de5011 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,14 @@ members = [
 	"xcm-support",
 ]
 
+resolver = "2"
+
+[profile.dev]
+split-debuginfo = "unpacked"
+
+[profile.release]
+panic = "unwind"
+
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
 # that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
 # their debug info might be missing) or to require to be frequently recompiled. We compile these
@@ -84,10 +92,6 @@ x25519-dalek = { opt-level = 3 }
 yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
 
-[profile.release]
-panic = "unwind"
-incremental = true
-
 [patch.crates-io]
 node-inspect = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" }
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11" }
diff --git a/integration-tests/src/kusama_cross_chain_transfer.rs b/integration-tests/src/kusama_cross_chain_transfer.rs
index b16d4f192f..367ee29a7e 100644
--- a/integration-tests/src/kusama_cross_chain_transfer.rs
+++ b/integration-tests/src/kusama_cross_chain_transfer.rs
@@ -36,7 +36,6 @@ fn transfer_from_relay_chain() {
 			)),
 			Box::new(VersionedMultiAssets::V1((Here, DOLLARS).into())),
 			0,
-			600_000_000
 		));
 	});
 
diff --git a/runtime/asgard/src/lib.rs b/runtime/asgard/src/lib.rs
index e8829c5243..0b0b25d70f 100644
--- a/runtime/asgard/src/lib.rs
+++ b/runtime/asgard/src/lib.rs
@@ -897,7 +897,7 @@ impl cumulus_pallet_xcm::Config for Runtime {
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
 	type Event = Event;
-	type VersionWrapper = ();
+	type VersionWrapper = PolkadotXcm;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }
 
diff --git a/runtime/bifrost/src/lib.rs b/runtime/bifrost/src/lib.rs
index 6c9c071abf..4ac80c2e69 100644
--- a/runtime/bifrost/src/lib.rs
+++ b/runtime/bifrost/src/lib.rs
@@ -816,7 +816,7 @@ impl cumulus_pallet_xcm::Config for Runtime {
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
 	type Event = Event;
-	type VersionWrapper = ();
+	type VersionWrapper = PolkadotXcm;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }