diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
index 38683641..a4e8202c 100644
--- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
+++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
@@ -359,6 +359,8 @@ export class AzureDeployerService implements IGBInstallationDeployer {
 
     GBLog.info(`Enabling resource providers...`);
     await this.enableResourceProviders('Microsoft.BotService');
+    await this.enableResourceProviders('Microsoft.Web');
+    await this.enableResourceProviders('Microsoft.Sql');
 
     GBLog.info(`Deploying Deploy Group (It may take a few minutes)...`);
     await this.createDeployGroup(name, instance.cloudLocation);
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index a358a7db..3ec46ead 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -773,16 +773,18 @@ export class GBMinService {
       await min.whatsAppDirectLine.setup(true);
     } else {
       const minBoot = GBServer.globals.minBoot as any;
-      min.whatsAppDirectLine = new WhatsappDirectLine(
-        min,
-        min.botId,
-        min.instance.whatsappBotKey,
-        minBoot.instance.whatsappServiceKey,
-        minBoot.instance.whatsappServiceNumber,
-        minBoot.instance.whatsappServiceUrl,
-        group
-      );
-      await min.whatsAppDirectLine.setup(false);
+      if (min !== minBoot) {
+        min.whatsAppDirectLine = new WhatsappDirectLine(
+          min,
+          min.botId,
+          min.instance.whatsappBotKey,
+          minBoot.instance.whatsappServiceKey,
+          minBoot.instance.whatsappServiceNumber,
+          minBoot.instance.whatsappServiceUrl,
+          group
+        );
+        await min.whatsAppDirectLine.setup(false);
+      }
     }
 
     // Setups default BOT Framework dialogs.
diff --git a/packages/core.gbapp/services/GBSSR.ts b/packages/core.gbapp/services/GBSSR.ts
index f196a89c..aa1b30f0 100644
--- a/packages/core.gbapp/services/GBSSR.ts
+++ b/packages/core.gbapp/services/GBSSR.ts
@@ -283,7 +283,7 @@ export class GBSSR {
 
     // Tries to find botId from URL.
 
-    const minBoot = GBServer.globals.minInstances[0];
+    const minBoot = GBServer.globals.minBoot;
     let botId =
       req.originalUrl && req.originalUrl === '/' ?
         minBoot.botId :
@@ -295,7 +295,9 @@ export class GBSSR {
     if (!min) {
       min = req.url === '/'
         ? minBoot
-        : GBServer.globals.minInstances.filter(p => p.instance.activationCode.toLowerCase() === botId.toLowerCase())[0];
+        : GBServer.globals.minInstances.filter(p =>
+          p.instance.activationCode ? p.instance.activationCode.toLowerCase() === botId.toLowerCase()
+            : null)[0];
     }
     if (!min) {
       botId = minBoot.botId;
diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
index 04c36998..27f731a3 100644
--- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
+++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
@@ -1042,7 +1042,7 @@ export class WhatsappDirectLine extends GBService {
         }
       }
 
-      // Detects if the welcome message is enabled.z
+      // Detects if the welcome message is enabled.
 
       if (process.env.WHATSAPP_WELCOME_DISABLED !== 'true') {
         // Tries to find if user wants to switch bots.