diff --git a/packages/amplify-category-analytics/src/migrations/in-app-messaging-migration.ts b/packages/amplify-category-analytics/src/migrations/in-app-messaging-migration.ts
index c9290bf344b..ed33ee7669e 100644
--- a/packages/amplify-category-analytics/src/migrations/in-app-messaging-migration.ts
+++ b/packages/amplify-category-analytics/src/migrations/in-app-messaging-migration.ts
@@ -4,7 +4,7 @@ import {
 } from 'amplify-cli-core';
 import fs from 'fs-extra';
 import * as path from 'path';
-import { pinpointHasInAppMessagingPolicy } from '../utils/pinpoint-helper';
+import { pinpointHasInAppMessagingPolicy, pinpointInAppMessagingPolicyName } from '../utils/pinpoint-helper';
 
 /**
  * checks if the project has been migrated to the latest version of in-app messaging
@@ -20,7 +20,7 @@ export const inAppMessagingMigrationCheck = async (context: $TSContext): Promise
       const cfn = JSONUtilities.readJson(templateFilePath);
       const updatedCfn = migratePinpointCFN(cfn);
       fs.ensureDirSync(resourcePath);
-      fs.writeFileSync(templateFilePath, JSON.stringify(updatedCfn, null, 4), 'utf8');
+      JSONUtilities.writeJson(templateFilePath, updatedCfn);
     });
   }
 };
@@ -28,7 +28,7 @@ export const inAppMessagingMigrationCheck = async (context: $TSContext): Promise
 const migratePinpointCFN = (cfn: $TSAny): $TSAny => {
   const { Parameters, Conditions, Resources } = cfn;
 
-  Parameters.pinpointInAppMessagingPolicyName = {
+  Parameters[pinpointInAppMessagingPolicyName] = {
     Type: 'String',
     Default: 'NONE',
   };
diff --git a/packages/amplify-category-analytics/src/utils/pinpoint-helper.ts b/packages/amplify-category-analytics/src/utils/pinpoint-helper.ts
index cca2ca73615..5f98b7bb46d 100644
--- a/packages/amplify-category-analytics/src/utils/pinpoint-helper.ts
+++ b/packages/amplify-category-analytics/src/utils/pinpoint-helper.ts
@@ -7,6 +7,8 @@ import { printer } from 'amplify-prompts';
 import * as path from 'path';
 import { getAnalyticsResources } from './analytics-helper';
 
+export const pinpointInAppMessagingPolicyName = 'pinpointInAppMessagingPolicyName';
+
 /**
  * opens resource in AWS console
  */
@@ -69,16 +71,16 @@ export const hasResource = (context: $TSContext): boolean => {
  */
 export const pinpointHasInAppMessagingPolicy = (context: $TSContext): boolean => {
   const resources = getAnalyticsResources(context, AmplifySupportedService.PINPOINT);
-  if (resources?.length > 0) {
-    const pinpointCloudFormationTemplatePath = path.join(
-      pathManager.getBackendDirPath(),
-      AmplifyCategories.ANALYTICS,
-      resources[0].resourceName,
-      `pinpoint-cloudformation-template.json`,
-    );
-    const { cfnTemplate } = readCFNTemplate(pinpointCloudFormationTemplatePath, { throwIfNotExist: false }) || {};
-    return !!cfnTemplate?.Parameters?.pinpointInAppMessagingPolicyName;
+  if (resources?.length === 0) {
+    return false;
   }
 
-  return false;
+  const pinpointCloudFormationTemplatePath = path.join(
+    pathManager.getBackendDirPath(),
+    AmplifyCategories.ANALYTICS,
+    resources[0].resourceName,
+    `pinpoint-cloudformation-template.json`,
+  );
+  const { cfnTemplate } = readCFNTemplate(pinpointCloudFormationTemplatePath, { throwIfNotExist: false }) || {};
+  return !!cfnTemplate?.Parameters?.[pinpointInAppMessagingPolicyName];
 };
diff --git a/packages/amplify-category-auth/src/index.js b/packages/amplify-category-auth/src/index.js
index dce529021c4..6b8211c61f6 100644
--- a/packages/amplify-category-auth/src/index.js
+++ b/packages/amplify-category-auth/src/index.js
@@ -527,7 +527,7 @@ async function isSMSWorkflowEnabled(context, resourceName) {
  * @param {Object} context - The amplify context.
  */
 const authPushYes = async context => {
-  const exeInfoClone = Object.assign({}, (context.exeInfo) || {});
+  const exeInfoClone = { ...context?.exeInfo };
   try {
     context.exeInfo = (context.exeInfo) || {};
     context.exeInfo.inputParams = (context.exeInfo.inputParams) || {};
diff --git a/packages/amplify-cli-npm/index.ts b/packages/amplify-cli-npm/index.ts
index 4ecf2bef801..102c64f6d5e 100644
--- a/packages/amplify-cli-npm/index.ts
+++ b/packages/amplify-cli-npm/index.ts
@@ -17,4 +17,4 @@ export const install = async (): Promise<void> => {
 };
 
 // force minor version bump
-// -
+// --