diff --git a/polkadot/runtime/parachains/src/scheduler.rs b/polkadot/runtime/parachains/src/scheduler.rs
index af48019124de225c6e8206027e60b4d82bf5e613..f3333d5cf8577eac6567e4cbd53f1a5433de4241 100644
--- a/polkadot/runtime/parachains/src/scheduler.rs
+++ b/polkadot/runtime/parachains/src/scheduler.rs
@@ -627,8 +627,8 @@ impl<T: Config> Pallet<T> {
 		if ValidatorGroups::<T>::decode_len().map_or(true, |l| l == 0) {
 			return
 		}
-
-		let n_lookahead = Self::claimqueue_lookahead();
+		// If there exists a core, ensure we schedule at least one job onto it.
+		let n_lookahead = Self::claimqueue_lookahead().max(1);
 		let n_session_cores = T::AssignmentProvider::session_core_count();
 		let cq = ClaimQueue::<T>::get();
 		let ttl = <configuration::Pallet<T>>::config().on_demand_ttl;
diff --git a/substrate/frame/support/src/traits/tokens/imbalance.rs b/substrate/frame/support/src/traits/tokens/imbalance.rs
index e487b8122341062ff0e4e8ed0bbf2ca23c8edbe2..9dd8531324dc9d4a2845fd40b09a0d32746a99b6 100644
--- a/substrate/frame/support/src/traits/tokens/imbalance.rs
+++ b/substrate/frame/support/src/traits/tokens/imbalance.rs
@@ -25,7 +25,7 @@ use sp_std::ops::Div;
 mod on_unbalanced;
 mod signed_imbalance;
 mod split_two_ways;
-pub use on_unbalanced::OnUnbalanced;
+pub use on_unbalanced::{OnUnbalanced, ResolveAssetTo, ResolveTo};
 pub use signed_imbalance::SignedImbalance;
 pub use split_two_ways::SplitTwoWays;
 
diff --git a/substrate/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs b/substrate/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
index 4be6cec346b80ad6013c108c1a4ff55f626585d1..ecb8de8841f91ca65a05eca687da5eaa8164a4a2 100644
--- a/substrate/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
+++ b/substrate/frame/support/src/traits/tokens/imbalance/on_unbalanced.rs
@@ -17,7 +17,9 @@
 
 //! Trait for handling imbalances.
 
-use crate::traits::misc::TryDrop;
+use frame_support::traits::{fungible, fungibles, misc::TryDrop};
+use sp_core::TypedGet;
+use sp_std::marker::PhantomData;
 
 /// Handler for when some currency "account" decreased in balance for
 /// some reason.