diff --git a/core/src/blocks/extrinsics.rs b/core/src/blocks/extrinsics.rs
index 0644cb64ca..112a20cb11 100644
--- a/core/src/blocks/extrinsics.rs
+++ b/core/src/blocks/extrinsics.rs
@@ -515,12 +515,12 @@ mod tests {
         let result = Extrinsics::<SubstrateConfig>::decode_from(vec![vec![]], metadata);
         assert_matches!(
             result.err(),
-            Some(crate::Error::Block(
-                crate::error::BlockError::ExtrinsicDecodeError {
+            Some(
+                crate::error::ExtrinsicError::LeftoverBytes {
                     extrinsic_index: 0,
-                    error: _
+                    num_leftover_bytes: _
                 }
-            ))
+            )
         );
     }
 
@@ -535,12 +535,12 @@ mod tests {
 
         assert_matches!(
             result.err(),
-            Some(crate::Error::Block(
-                crate::error::BlockError::ExtrinsicDecodeError {
+            Some(
+                crate::error::ExtrinsicError::ExtrinsicDecodeError {
                     extrinsic_index: 0,
                     error: ExtrinsicDecodeError::VersionNotSupported(3),
                 }
-            ))
+            )
         );
     }
 
@@ -614,17 +614,13 @@ mod tests {
 
         assert_eq!(extrinsic.pallet_index(), 0);
         assert_eq!(
-            extrinsic
-                .pallet_name()
-                .expect("Valid metadata contains pallet name"),
+            extrinsic.pallet_name(),
             "Test"
         );
 
         assert_eq!(extrinsic.variant_index(), 2);
         assert_eq!(
-            extrinsic
-                .call_name()
-                .expect("Valid metadata contains variant name"),
+            extrinsic.call_name(),
             "TestCall"
         );
 
diff --git a/subxt/src/backend/mod.rs b/subxt/src/backend/mod.rs
index 052c075817..5595de47bf 100644
--- a/subxt/src/backend/mod.rs
+++ b/subxt/src/backend/mod.rs
@@ -12,7 +12,7 @@ pub mod utils;
 
 use crate::config::{Config, HashFor};
 use crate::error::Error;
-use crate::Metadata;
+use subxt_metadata::Metadata;
 use async_trait::async_trait;
 use codec::{Decode, Encode};
 use futures::{Stream, StreamExt};
diff --git a/subxt/src/blocks/extrinsic_types.rs b/subxt/src/blocks/extrinsic_types.rs
index dfb5cca915..bae787dd80 100644
--- a/subxt/src/blocks/extrinsic_types.rs
+++ b/subxt/src/blocks/extrinsic_types.rs
@@ -16,7 +16,7 @@ use subxt_core::blocks::{ExtrinsicDetails as CoreExtrinsicDetails, Extrinsics as
 
 // Re-export anything that's directly returned/used in the APIs below.
 pub use subxt_core::blocks::{
-    ExtrinsicMetadataDetails, ExtrinsicTransactionExtension, ExtrinsicExtrinsicParams,
+    ExtrinsicMetadataDetails, ExtrinsicTransactionExtension, ExtrinsicParams,
     StaticExtrinsic,
 };