diff --git a/client/service/src/builder_ext.rs b/client/service/src/builder_ext.rs
index fc92299..92a34f5 100644
--- a/client/service/src/builder_ext.rs
+++ b/client/service/src/builder_ext.rs
@@ -74,23 +74,25 @@ where
 	// for import_queue
 	TFullClient<TBl, TRtApi, TExecDisp>:
 		sp_consensus::BlockImport<TBl, Error = sp_consensus::Error>,
-	<TFullClient<TBl, TRtApi, TExecDisp> as sp_api::ProvideRuntimeApi<TBl>>::Api: sp_api::Core<TBl, Error = sp_blockchain::Error>
-		+ ApiExt<
-			TBl,
-			StateBackend = <TFullBackend<TBl> as sc_client_api::backend::Backend<TBl>>::State,
-		>,
+	<TFullClient<TBl, TRtApi, TExecDisp> as sp_api::ProvideRuntimeApi<TBl>>::Api:
+		sp_api::Core<TBl, Error = sp_blockchain::Error>
+			+ ApiExt<
+				TBl,
+				StateBackend = <TFullBackend<TBl> as sc_client_api::backend::Backend<TBl>>::State,
+			>,
 	// spawn_tasks
-	TFullClient<TBl, TRtApi, TExecDisp>: sp_blockchain::HeaderMetadata<TBl, Error = sp_blockchain::Error>
-		+ sp_consensus::block_validation::Chain<TBl>
-		+ sp_runtime::traits::BlockIdTo<TBl, Error = sp_blockchain::Error>
-		+ sc_client_api::ProofProvider<TBl>
-		+ sp_blockchain::HeaderBackend<TBl>
-		+ sc_client_api::BlockchainEvents<TBl>
-		+ sc_client_api::UsageProvider<TBl>
-		+ sc_client_api::StorageProvider<TBl, TFullBackend<TBl>>
-		+ sp_api::CallApiAt<TBl, Error = sp_blockchain::Error>
-		+ Send
-		+ 'static,
+	TFullClient<TBl, TRtApi, TExecDisp>:
+		sp_blockchain::HeaderMetadata<TBl, Error = sp_blockchain::Error>
+			+ sp_consensus::block_validation::Chain<TBl>
+			+ sp_runtime::traits::BlockIdTo<TBl, Error = sp_blockchain::Error>
+			+ sc_client_api::ProofProvider<TBl>
+			+ sp_blockchain::HeaderBackend<TBl>
+			+ sc_client_api::BlockchainEvents<TBl>
+			+ sc_client_api::UsageProvider<TBl>
+			+ sc_client_api::StorageProvider<TBl, TFullBackend<TBl>>
+			+ sp_api::CallApiAt<TBl, Error = sp_blockchain::Error>
+			+ Send
+			+ 'static,
 	<TFullClient<TBl, TRtApi, TExecDisp> as sp_api::ProvideRuntimeApi<TBl>>::Api:
 		sp_api::Metadata<TBl>
 			+ sp_session::SessionKeys<TBl>
diff --git a/client/service/src/client/mod.rs b/client/service/src/client/mod.rs
index adf81e2..a616f37 100644
--- a/client/service/src/client/mod.rs
+++ b/client/service/src/client/mod.rs
@@ -46,7 +46,7 @@ use sp_runtime::{
 	generic::{BlockId, SignedBlock},
 	traits::{
 		Block as BlockT, DigestFor, HashFor, Header as HeaderT, NumberFor, One,
-		SaturatedConversion, Zero,
+		UniqueSaturatedInto, Zero,
 	},
 	BuildStorage, Justification,
 };
@@ -928,7 +928,7 @@ where
 		let mut ancestor = load_header(ancestor_hash)?;
 		let mut uncles = Vec::new();
 
-		for _generation in 0..max_generation.saturated_into() {
+		for _generation in 0u32..UniqueSaturatedInto::<u32>::unique_saturated_into(max_generation) {
 			let children = self.backend.blockchain().children(ancestor_hash)?;
 			uncles.extend(children.into_iter().filter(|h| h != &current_hash));
 			current_hash = ancestor_hash;
@@ -1038,8 +1038,9 @@ where
 	E: CallExecutor<Block> + Send + Sync + 'static,
 	Block: BlockT,
 	Self: ChainHeaderBackend<Block> + ProvideRuntimeApi<Block>,
-	<Self as ProvideRuntimeApi<Block>>::Api: ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
-		+ BlockBuilderApi<Block, Error = Error>,
+	<Self as ProvideRuntimeApi<Block>>::Api:
+		ApiExt<Block, StateBackend = backend::StateBackendFor<B, Block>>
+			+ BlockBuilderApi<Block, Error = Error>,
 {
 	fn new_block_at<R: Into<RecordProof>>(
 		&self,