diff --git a/node/overseer/overseer-gen/proc-macro/src/impl_builder.rs b/node/overseer/overseer-gen/proc-macro/src/impl_builder.rs
index 89ff7ecf04d9..6db5341edab8 100644
--- a/node/overseer/overseer-gen/proc-macro/src/impl_builder.rs
+++ b/node/overseer/overseer-gen/proc-macro/src/impl_builder.rs
@@ -89,7 +89,7 @@ pub(crate) fn impl_builder(info: &OverseerInfo) -> proc_macro2::TokenStream {
 		where
 			S: #support_crate ::SpawnNamed,
 		#(
-			#builder_generic_ty : Subsystem<#subsyste_ctx_name< #consumes >>,
+			#builder_generic_ty : Subsystem<#subsyste_ctx_name< #consumes >, #error_ty>,
 		)*
 	};
 
@@ -229,7 +229,7 @@ pub(crate) fn impl_builder(info: &OverseerInfo) -> proc_macro2::TokenStream {
 						to_overseer_tx.clone(),
 					);
 
-					let #subsystem_name: crate::OverseenSubsystem< #consumes > =
+					let #subsystem_name: OverseenSubsystem< #consumes > =
 						spawn::<_,_, #blocking, _, _, _>(
 							&mut spawner,
 							#channel_name_tx,
@@ -320,16 +320,16 @@ pub(crate) fn impl_task_kind(info: &OverseerInfo) -> proc_macro2::TokenStream {
 			ctx: Ctx,
 			subsystem: SubSys,
 			futures: &mut #support_crate ::FuturesUnordered<BoxFuture<'static, ::std::result::Result<(), #error_ty> >>,
-		) -> ::std::result::Result<crate ::OverseenSubsystem<M>, #error_ty >
+		) -> ::std::result::Result<OverseenSubsystem<M>, #error_ty >
 		where
 			S: #support_crate ::SpawnNamed,
 			M: std::fmt::Debug + Send + 'static,
 			TK: TaskKind,
-			Ctx: SubsystemContext<Message=M>,
+			Ctx: #support_crate ::SubsystemContext<Message=M>,
 			E: std::error::Error + Send + Sync + 'static + From<#support_crate ::OverseerError>,
-			SubSys: Subsystem<Ctx>,
+			SubSys: #support_crate ::Subsystem<Ctx, E>,
 		{
-			let SpawnedSubsystem { future, name } = subsystem.start(ctx);
+			let #support_crate ::SpawnedSubsystem::<E> { future, name } = s.start(ctx);
 
 			let (tx, rx) = #support_crate ::oneshot::channel();
 
@@ -363,7 +363,7 @@ pub(crate) fn impl_task_kind(info: &OverseerInfo) -> proc_macro2::TokenStream {
 				name,
 			});
 
-			Ok(crate::OverseenSubsystem {
+			Ok(OverseenSubsystem {
 				instance,
 			})
 		}
diff --git a/node/overseer/overseer-gen/proc-macro/src/impl_overseer.rs b/node/overseer/overseer-gen/proc-macro/src/impl_overseer.rs
index ba9b94ac7afc..1769de00ff8d 100644
--- a/node/overseer/overseer-gen/proc-macro/src/impl_overseer.rs
+++ b/node/overseer/overseer-gen/proc-macro/src/impl_overseer.rs
@@ -72,7 +72,7 @@ pub(crate) fn impl_overseer_struct(info: &OverseerInfo) -> proc_macro2::TokenStr
 
 			#(
 				/// A subsystem instance.
-				#subsystem_name: crate::OverseenSubsystem< #consumes >,
+				#subsystem_name: OverseenSubsystem< #consumes >,
 			)*
 
 			#(
@@ -90,7 +90,7 @@ pub(crate) fn impl_overseer_struct(info: &OverseerInfo) -> proc_macro2::TokenStr
 
 			/// Gather running subsystems' outbound streams into one.
 			to_overseer_rx: #support_crate ::stream::Fuse<
-				#support_crate ::metered::UnboundedMeteredReceiver< ToOverseer >
+				#support_crate ::metered::UnboundedMeteredReceiver< #support_crate ::ToOverseer >
 			>,
 
 			/// Events that are sent to the overseer from the outside world.
@@ -143,7 +143,7 @@ pub(crate) fn impl_overseer_struct(info: &OverseerInfo) -> proc_macro2::TokenStr
 				match message {
 					#(
 						#message_wrapper :: #consumes_variant ( inner ) =>
-							crate::OverseenSubsystem::< #consumes >::send_message2(&mut self. #subsystem_name, inner, origin ).await?,
+							OverseenSubsystem::< #consumes >::send_message2(&mut self. #subsystem_name, inner, origin ).await?,
 					)*
 					// subsystems that are still work in progress
 					#(
diff --git a/node/overseer/overseer-gen/proc-macro/src/impl_subsystem_ctx.rs b/node/overseer/overseer-gen/proc-macro/src/impl_subsystem_ctx.rs
index a31589886963..4e3b22ac029f 100644
--- a/node/overseer/overseer-gen/proc-macro/src/impl_subsystem_ctx.rs
+++ b/node/overseer/overseer-gen/proc-macro/src/impl_subsystem_ctx.rs
@@ -118,7 +118,7 @@ pub(crate) fn impl_trait(info: &OverseerInfo) -> proc_macro2::TokenStream {
 				signals: #support_crate ::metered::MeteredReceiver< #signal >,
 				messages: SubsystemIncomingMessages<M>,
 				to_subsystems: ChannelsOut,
-				to_overseer: #support_crate ::metered::UnboundedMeteredSender<ToOverseer>,
+				to_overseer: #support_crate ::metered::UnboundedMeteredSender<#support_crate:: ToOverseer>,
 			) -> Self {
 				let signals_received = SignalsReceived::default();
 				#subsystem_ctx_name {
@@ -136,7 +136,7 @@ pub(crate) fn impl_trait(info: &OverseerInfo) -> proc_macro2::TokenStream {
 		}
 
 		#[#support_crate ::async_trait]
-		impl<M: std::fmt::Debug + Send + 'static> SubsystemContext for #subsystem_ctx_name<M>
+		impl<M: std::fmt::Debug + Send + 'static> #support_crate ::SubsystemContext for #subsystem_ctx_name<M>
 		where
 			#subsystem_sender_name: #support_crate:: SubsystemSender< #wrapper_message >,
 			#wrapper_message: From<M>,