diff --git a/substrate/frame/contracts/build.rs b/substrate/frame/contracts/build.rs
index 7817ace9c98e2e877080d05552914f39d89eec85..42bc45d563d325a605c79749f096b5048a412af5 100644
--- a/substrate/frame/contracts/build.rs
+++ b/substrate/frame/contracts/build.rs
@@ -53,7 +53,7 @@ fn get_latest_version() -> u16 {
 fn main() -> Result<(), Box<dyn std::error::Error>> {
 	let out_dir = std::env::var("OUT_DIR")?;
 	let path = std::path::Path::new(&out_dir).join("migration_codegen.rs");
-	let mut f = std::fs::File::create(&path)?;
+	let mut f = std::fs::File::create(path)?;
 	let version = get_latest_version();
 	write!(
 		f,
diff --git a/substrate/frame/contracts/src/tests.rs b/substrate/frame/contracts/src/tests.rs
index 0c0a2f7f9327315a5991e2283e6e3f6b00aedf87..8d6c5c5ac728a5d771a38bf76b927a4b8bf1ffc2 100644
--- a/substrate/frame/contracts/src/tests.rs
+++ b/substrate/frame/contracts/src/tests.rs
@@ -564,7 +564,9 @@ where
 {
 	let fixture_path = [
 		// When `CARGO_MANIFEST_DIR` is not set, Rust resolves relative paths from the root folder
-		std::env::var("CARGO_MANIFEST_DIR").as_deref().unwrap_or("frame/contracts"),
+		std::env::var("CARGO_MANIFEST_DIR")
+			.as_deref()
+			.unwrap_or("substrate/frame/contracts"),
 		"/fixtures/",
 		fixture_name,
 		".wat",
diff --git a/substrate/frame/contracts/src/wasm/runtime.rs b/substrate/frame/contracts/src/wasm/runtime.rs
index 4bc00388f726fb2f4057b6e527157ec6080439fa..4fd52b471a0c6b41cabd364d530d2989891591d7 100644
--- a/substrate/frame/contracts/src/wasm/runtime.rs
+++ b/substrate/frame/contracts/src/wasm/runtime.rs
@@ -608,7 +608,7 @@ impl<'a, E: Ext + 'a> Runtime<'a, E> {
 		let mut bound_checked = memory
 			.get(ptr..ptr + D::max_encoded_len() as usize)
 			.ok_or_else(|| Error::<E::T>::OutOfBounds)?;
-		let decoded = D::decode_all_with_depth_limit(MAX_DECODE_NESTING, &mut bound_checked)
+		let decoded = D::decode_with_depth_limit(MAX_DECODE_NESTING, &mut bound_checked)
 			.map_err(|_| DispatchError::from(Error::<E::T>::DecodingFailed))?;
 		Ok(decoded)
 	}