diff --git a/codegen/src/shuttle_main/mod.rs b/codegen/src/shuttle_main/mod.rs
index d6cb892eb..ac847ff09 100644
--- a/codegen/src/shuttle_main/mod.rs
+++ b/codegen/src/shuttle_main/mod.rs
@@ -232,7 +232,7 @@ impl ToTokens for Loader {
             None
         } else {
             Some(parse_quote!(
-                use ::shuttle_runtime::__internals::{Factory, ResourceBuilder};
+                use ::shuttle_runtime::{Factory, ResourceBuilder};
             ))
         };
 
@@ -399,7 +399,7 @@ mod tests {
                 mut resource_tracker: ::shuttle_runtime::__internals::ResourceTracker,
             ) -> ShuttleComplex {
                 use ::shuttle_runtime::__internals::Context;
-                use ::shuttle_runtime::__internals::{Factory, ResourceBuilder};
+                use ::shuttle_runtime::{Factory, ResourceBuilder};
                 let pool = ::shuttle_runtime::__internals::get_resource(
                     shuttle_shared_db::Postgres::new(),
                     &mut factory,
@@ -510,7 +510,7 @@ mod tests {
                 mut resource_tracker: ::shuttle_runtime::__internals::ResourceTracker,
             ) -> ShuttleComplex {
                 use ::shuttle_runtime::__internals::Context;
-                use ::shuttle_runtime::__internals::{Factory, ResourceBuilder};
+                use ::shuttle_runtime::{Factory, ResourceBuilder};
                 let vars = std::collections::HashMap::from_iter(factory.get_secrets().await?.into_iter().map(|(key, value)| (format!("secrets.{}", key), value)));
                 let pool = ::shuttle_runtime::__internals::get_resource (
                     shuttle_shared_db::Postgres::new().size(&::shuttle_runtime::__internals::strfmt("10Gb", &vars)?).public(false),
diff --git a/services/shuttle-poise/src/lib.rs b/services/shuttle-poise/src/lib.rs
index f625ca45e..aed756718 100644
--- a/services/shuttle-poise/src/lib.rs
+++ b/services/shuttle-poise/src/lib.rs
@@ -1,7 +1,6 @@
 //! Shuttle service integration for the Poise discord bot framework.
 //! ## Example
 //! ```rust,no_run
-//! use shuttle_runtime::Context as _;
 //! use poise::serenity_prelude as serenity;
 //! use shuttle_secrets::SecretStore;
 //! use shuttle_poise::ShuttlePoise;
@@ -22,7 +21,7 @@
 //!     // Get the discord token set in `Secrets.toml`
 //!     let discord_token = secret_store
 //!         .get("DISCORD_TOKEN")
-//!         .context("'DISCORD_TOKEN' was not found")?;
+//!         .expect("'DISCORD_TOKEN' was not found");
 //!
 //!     let framework = poise::Framework::builder()
 //!         .options(poise::FrameworkOptions {