diff --git a/src/actions/sdk/publish.ts b/src/actions/sdk/publish.ts
index 6f67bf86..d62c3e68 100644
--- a/src/actions/sdk/publish.ts
+++ b/src/actions/sdk/publish.ts
@@ -39,9 +39,11 @@ export class SdkPublishAction {
   ): Promise<ActionResult<PublishingInfo>> => {
     return await withDirPath(async (tempDirectory) => {
       const packageConfiguration = publishingProfile.getPackageConfigurationForLanguage(language);
+      let packageSettingsDirectory: DirectoryPath | undefined;
+
       if (packageConfiguration !== null && packageConfiguration.isEnabled) {
         const packageSettingsConfiguration = PackageSettingsConfiguration.create(language, packageConfiguration);
-        const packageSettingsDirectory = tempDirectory.join('package-settings');
+        packageSettingsDirectory = tempDirectory.join('package-settings');
         const packageSettingsContext = new PackageSettingsContext(packageSettingsDirectory);
         await packageSettingsContext.writeConfiguration(packageSettingsConfiguration, language);
       }
@@ -57,7 +59,7 @@ export class SdkPublishAction {
         false,
         undefined,
         semVersion,
-        tempDirectory
+        packageSettingsDirectory
       );
       if (sdkGenerationResult.isFailed()) {
         return ActionResult.failed();
diff --git a/src/infrastructure/env-info.ts b/src/infrastructure/env-info.ts
index b3d35bd9..d03c9565 100644
--- a/src/infrastructure/env-info.ts
+++ b/src/infrastructure/env-info.ts
@@ -57,7 +57,7 @@ class EnvInfo {
     const envBaseUrls = process.env.APIMATIC_BASE_URL;
     if (envBaseUrls) {
       const baseUrls = envBaseUrls.split(';');
-      EnvInfo.cachedAuthBaseUrl = baseUrls.length === 2 ? baseUrls[1] : undefined;
+      EnvInfo.cachedAuthBaseUrl = baseUrls.length === 3 ? baseUrls[1] : undefined;
     }
     return EnvInfo.cachedAuthBaseUrl;
   }
diff --git a/src/types/build-context.ts b/src/types/build-context.ts
index ded183a3..8dfcfd8b 100644
--- a/src/types/build-context.ts
+++ b/src/types/build-context.ts
@@ -52,7 +52,7 @@ export class BuildContext {
     const tempBuildDir = tempDir.join("build");
     await this.fileService.copyDirectoryContents(this.buildDirectory, tempBuildDir);
     if (packageSettingsDirectory) {
-      await this.fileService.copyDirectoryContents(packageSettingsDirectory.join('package-settings'), tempBuildDir.join('package-settings'));
+      await this.fileService.copyDirectoryContents(packageSettingsDirectory, tempBuildDir.join('package-settings'));
     }
     return await tempContext.zip(tempBuildDir);
   }