diff --git a/scarb/src/bin/scarb/commands/proc_macro_server.rs b/scarb/src/bin/scarb/commands/proc_macro_server.rs
index 56900eea8..b2165899b 100644
--- a/scarb/src/bin/scarb/commands/proc_macro_server.rs
+++ b/scarb/src/bin/scarb/commands/proc_macro_server.rs
@@ -16,8 +16,8 @@ pub fn run(config: &mut Config) -> Result<()> {
             no_default_features: false,
         },
         true,
-        &ws,
         true,
+        &ws,
     )?;
 
     // Compile procedural macros only.
diff --git a/scarb/src/ops/compile.rs b/scarb/src/ops/compile.rs
index 33678520b..64cbd9c75 100644
--- a/scarb/src/ops/compile.rs
+++ b/scarb/src/ops/compile.rs
@@ -129,8 +129,8 @@ where
         &resolve,
         &opts.features,
         opts.ignore_cairo_version,
-        ws,
         true,
+        ws,
     )?
     .into_iter()
     .filter(|cu| {
diff --git a/scarb/src/ops/expand.rs b/scarb/src/ops/expand.rs
index 4a6b5d941..0edb61da3 100644
--- a/scarb/src/ops/expand.rs
+++ b/scarb/src/ops/expand.rs
@@ -47,8 +47,8 @@ pub fn expand(package: Package, opts: ExpandOpts, ws: &Workspace<'_>) -> Result<
         &resolve,
         &opts.features,
         opts.ignore_cairo_version,
-        ws,
         true,
+        ws,
     )?;
 
     // Compile procedural macros.
diff --git a/scarb/src/ops/metadata.rs b/scarb/src/ops/metadata.rs
index abe84111f..ad69030ed 100644
--- a/scarb/src/ops/metadata.rs
+++ b/scarb/src/ops/metadata.rs
@@ -48,8 +48,8 @@ pub fn collect_metadata(opts: &MetadataOptions, ws: &Workspace<'_>) -> Result<m:
             &resolve,
             &opts.features,
             opts.ignore_cairo_version,
+            false,
             ws,
-            true,
         )?
         .iter()
         .flat_map(collect_compilation_unit_metadata)
diff --git a/scarb/src/ops/resolve.rs b/scarb/src/ops/resolve.rs
index 0eb4f01de..a3d561d2b 100644
--- a/scarb/src/ops/resolve.rs
+++ b/scarb/src/ops/resolve.rs
@@ -175,8 +175,8 @@ pub fn generate_compilation_units(
     resolve: &WorkspaceResolve,
     enabled_features: &FeaturesOpts,
     ignore_cairo_version: bool,
-    ws: &Workspace<'_>,
     load_prebuilts: bool,
+    ws: &Workspace<'_>,
 ) -> Result<Vec<CompilationUnit>> {
     let mut units = Vec::with_capacity(ws.members().size_hint().0);
     let members = ws