diff --git a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/FileManager+Utils.swift b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/FileManager+Utils.swift
index da82c416cc3..e5ce8e2fce3 100644
--- a/AWSSDKSwiftCLI/Sources/AWSCLIUtils/FileManager+Utils.swift
+++ b/AWSSDKSwiftCLI/Sources/AWSCLIUtils/FileManager+Utils.swift
@@ -58,6 +58,7 @@ public extension FileManager {
             .sorted()
             .filter { $0 != "libxml2" } // Ignore libxml module
             .filter { $0 != "SmithyCodegenCLI" } // Ignore codegen component
+            .filter { $0 != "SmithyCodegenCore" } // Ignore codegen component
             .filter { !$0.hasPrefix(".") }
     }
 
diff --git a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt
index 08e7d64d602..743fbe7d7b0 100644
--- a/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt
+++ b/AWSSDKSwiftCLI/Sources/AWSSDKSwiftCLI/Resources/Package.Base.txt
@@ -226,7 +226,7 @@ private var internalClientDependencies: [Target.Dependency] {
 }
 
 private var internalServiceTargets: [Target] {
-    serviceClientData.filter { $0.serviceType == .internalUse }.map(target(_:))
+    serviceClientData.filter { $0.serviceType == .internalUse }.map { .target(name: $0.name, dependencies: $0.dependencies, path: $0.sourcePath) }
 }
 
 private var runtimeTestTargets: [Target] {
diff --git a/Package.swift b/Package.swift
index fe20aa19325..c4e77275525 100644
--- a/Package.swift
+++ b/Package.swift
@@ -2358,7 +2358,7 @@ private var internalClientDependencies: [Target.Dependency] {
 }
 
 private var internalServiceTargets: [Target] {
-    serviceClientData.filter { $0.serviceType == .internalUse }.map(target(_:))
+    serviceClientData.filter { $0.serviceType == .internalUse }.map { .target(name: $0.name, dependencies: $0.dependencies, path: $0.sourcePath) }
 }
 
 private var runtimeTestTargets: [Target] {