diff --git a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts
index 9c38dbf0..679f50fa 100644
--- a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts
+++ b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts
@@ -48,9 +48,7 @@ const scanf = require('scanf');
  * Handles command-line dialog for getting info for Boot Bot.
  */
 export class StartDialog {
-
   public static async createBaseInstance() {
-
     // No .env so asks for cloud credentials to start a new farm.
 
     if (!fs.existsSync(`.env`)) {
@@ -105,7 +103,7 @@ export class StartDialog {
     }
 
     // Prepares the first instance on bot farm.
-    const instance = new GuaribasInstance();
+    const instance: IGBInstance = {};
 
     instance.botId = botId;
     instance.cloudUsername = username;
@@ -117,7 +115,7 @@ export class StartDialog {
     instance.marketplacePassword = appPassword;
     instance.adminPass = GBAdminService.getRndPassword();
 
-    return {instance, credentials, subscriptionId};
+    return { instance, credentials, subscriptionId };
   }
 
   private static retrieveUsername() {
@@ -165,7 +163,11 @@ cannot start or end with or contain consecutive dashes and having 4 to 42 charac
           GBAdminService.GB_PROMPT
         }Due to this opened issue: https://github.com/Microsoft/botbuilder-tools/issues/550\n`
       );
-      process.stdout.write(`${GBAdminService.GB_PROMPT}Please enter your LUIS Authoring Key, get it here: https://www.luis.ai/user/settings and paste it to me:`);
+      process.stdout.write(
+        `${
+          GBAdminService.GB_PROMPT
+        }Please enter your LUIS Authoring Key, get it here: https://www.luis.ai/user/settings and paste it to me:`
+      );
       authoringKey = scanf('%s').replace(/(\n|\r)+$/, '');
     }
 
diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
index 8e237aab..3ea78a42 100644
--- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
+++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
@@ -367,7 +367,7 @@ export class AzureDeployerService extends GBService {
     subscriptionId
   ) {
 
-    const instance = new GuaribasInstance();
+    const instance: IGBInstance = {};
 
     instance.botId = title;
     instance.cloudUsername = username;
@@ -494,7 +494,6 @@ export class AzureDeployerService extends GBService {
       const res = await httpClient.sendRequest(req);
       if (!(res.bodyAsJson as any).id) {
         reject(res.bodyAsText);
-
         return;
       }
 
diff --git a/packages/core.gbapp/services/GBConfigService.ts b/packages/core.gbapp/services/GBConfigService.ts
index 60160e01..e6be5c2d 100644
--- a/packages/core.gbapp/services/GBConfigService.ts
+++ b/packages/core.gbapp/services/GBConfigService.ts
@@ -74,6 +74,12 @@ export class GBConfigService {
         case 'CLOUD_LOCATION':
           value = undefined;
           break;
+        case 'MARKETPLACE_ID':
+          value = undefined;
+          break;
+        case 'MARKETPLACE_SECRET':
+          value = undefined;
+          break;
         case 'NLP_AUTHORING_KEY':
           value = undefined;
           break;
diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts
index bfd0ad62..8716a1d7 100644
--- a/packages/core.gbapp/services/GBCoreService.ts
+++ b/packages/core.gbapp/services/GBCoreService.ts
@@ -309,8 +309,8 @@ STORAGE_SYNC=true
    */
   public async ensureInstances(instances: GuaribasInstance[], bootInstance: any, core: GBCoreService) {
     if (!instances) {
-      const saveInstance = new GuaribasInstance(bootInstance);
-      await saveInstance.save();
+      const instance: IGBInstance = {};
+      await instance.save();
       instances = await core.loadInstances();
     }
 
diff --git a/src/app.ts b/src/app.ts
index b598c88e..4fd8ec5d 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -91,7 +91,6 @@ export class GBServer {
 
           GBConfigService.init();
           const core = new GBCoreService();
-          core.ensureAdminIsSecured();
 
           const importer: GBImporter = new GBImporter(core);
           const deployer: GBDeployer = new GBDeployer(core, importer);
@@ -114,6 +113,8 @@ export class GBServer {
             await core.initStorage();
           }
 
+          core.ensureAdminIsSecured();
+
           // Deploys system and user packages.
 
           logger.info(`Deploying packages...`);