diff --git a/Composer/packages/client/src/components/CreationFlow/v2/CreateBot.tsx b/Composer/packages/client/src/components/CreationFlow/v2/CreateBot.tsx
index b8d7bb8b71..0395145f05 100644
--- a/Composer/packages/client/src/components/CreationFlow/v2/CreateBot.tsx
+++ b/Composer/packages/client/src/components/CreationFlow/v2/CreateBot.tsx
@@ -239,7 +239,11 @@ export function CreateBotV2(props: CreateBotProps) {
           }}
         >
           <PivotItem data-testid="dotnetFeed" headerText="C#" itemKey={csharpFeedKey}></PivotItem>
-          <PivotItem data-testid="nodeFeed" headerText="Node" itemKey={nodeFeedKey}></PivotItem>
+          <PivotItem
+            data-testid="nodeFeed"
+            headerText={formatMessage('Node (Preview)')}
+            itemKey={nodeFeedKey}
+          ></PivotItem>
         </Pivot>
         <div css={pickerContainer}>
           <div css={detailListContainer} data-is-scrollable="true" id="templatePickerContainer">
diff --git a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx
index 2307bf7a59..47e599b20b 100644
--- a/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx
+++ b/Composer/packages/client/src/components/CreationFlow/v2/DefineConversation.tsx
@@ -154,7 +154,7 @@ const DefineConversationV2: React.FC<DefineConversationProps> = (props) => {
         if (!value || !nameRegexV2.test(`${value}`)) {
           // botName is used as used when generating runtime namespaces which cannot start with a number
           if (value && !isNaN(+value.toString().charAt(0))) {
-            return formatMessage('Bot name cannot not start with a number');
+            return formatMessage('Bot name cannot start with a number or space');
           } else {
             return formatMessage('Spaces and special characters are not allowed. Use letters, numbers, or _.');
           }
diff --git a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
index d2a0a6f055..20c9cf7992 100644
--- a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
+++ b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
@@ -177,7 +177,7 @@ export const CreateQnAFromUrlModal: React.FC<CreateQnAFromUrlModalProps> = (prop
       }}
       hidden={false}
       modalProps={{
-        isBlocking: false,
+        isBlocking: true,
         styles: styles.modalCreateFromUrl,
       }}
       onDismiss={handleDismiss}
diff --git a/Composer/packages/client/src/pages/publish/Publish.tsx b/Composer/packages/client/src/pages/publish/Publish.tsx
index 28e628052c..d30d0af7a0 100644
--- a/Composer/packages/client/src/pages/publish/Publish.tsx
+++ b/Composer/packages/client/src/pages/publish/Publish.tsx
@@ -95,7 +95,7 @@ const Publish: React.FC<RouteComponentProps<{ projectId: string; targetName?: st
 
   const botStatusList = useMemo(() => {
     return generateBotStatusList(currentBotList, botPropertyData, publishHistoryList);
-  }, [currentBotList, botPropertyData, publishHistoryList]);
+  }, [currentBotList, botPropertyData, publishHistoryList, botProjectData]);
 
   const isPublishPending = useMemo(() => {
     return Object.values(updaterStatus).some(Boolean);