diff --git a/Makefile.toml b/Makefile.toml
index 7831b5f5f..1ea2b7ee0 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -24,7 +24,7 @@ args = [
     "--all-features",
     "--no-deps",
     "--",
-    "--D",
+    "-D",
     "warnings",
 ]
 
diff --git a/cargo-shuttle/src/lib.rs b/cargo-shuttle/src/lib.rs
index 2662cfe0d..ab85d4d18 100644
--- a/cargo-shuttle/src/lib.rs
+++ b/cargo-shuttle/src/lib.rs
@@ -1792,12 +1792,21 @@ impl Shuttle {
 
             let metadata = async_cargo_metadata(manifest_path.as_path()).await?;
             let packages = find_shuttle_packages(&metadata)?;
-            let package_name = packages
+            // TODO: support overriding this
+            let package = packages
                 .first()
-                .expect("at least one shuttle crate in the workspace")
-                .name
-                .to_owned();
+                .expect("at least one shuttle crate in the workspace");
+            let package_name = package.name.to_owned();
             deployment_req_beta.package_name = package_name;
+
+            // TODO: add these to the request and builder
+            let (_no_default_features, _features) = if package.features.contains_key("shuttle") {
+                (true, vec!["shuttle".to_owned()])
+            } else {
+                (false, vec![])
+            };
+            // TODO: determine which (one) binary to build
+            // TODO: have the above be configurable in CLI and Shuttle.toml
         }
 
         if let Ok(repo) = Repository::discover(working_directory) {
diff --git a/common/src/models/resource.rs b/common/src/models/resource.rs
index a8563db2a..236106498 100644
--- a/common/src/models/resource.rs
+++ b/common/src/models/resource.rs
@@ -56,7 +56,7 @@ pub fn get_resource_tables(
             output.push(get_secrets_table(secrets, service_name, raw));
         };
 
-        if resource_groups.get("Persist").is_some() {
+        if resource_groups.contains_key("Persist") {
             output.push(format!("This persist instance is linked to {service_name}\nShuttle Persist: {service_name}\n"));
         };
 
diff --git a/examples b/examples
index e9aa7c2db..4819a68c2 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit e9aa7c2db19ea26be21ea5804001bd458894a9f8
+Subproject commit 4819a68c2fdad2e9ae9fd1d0c1aa8e1f97fcea40
diff --git a/service/src/builder.rs b/service/src/builder.rs
index 9a0d4a45a..a40525c97 100644
--- a/service/src/builder.rs
+++ b/service/src/builder.rs
@@ -223,7 +223,11 @@ async fn compile(
         cmd.arg("--jobs=4");
     }
 
+    // TODO: Compile only one binary target in the package.
     for package in &packages {
+        if package.features.contains_key("shuttle") {
+            cmd.arg("--no-default-features").arg("--features=shuttle");
+        }
         cmd.arg("--package").arg(package.name.as_str());
     }