diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
index 3d4be68f53..05a2eebae3 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
@@ -651,7 +651,7 @@ Returns:
       //
       // Initialize strings to HII database
       //
-      PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, STRING_ARRAY_NAME);
+      PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, CpuStrings);
 
       Status      = Hii->NewPack (Hii, PackageList, &StringHandle);
       ASSERT (!EFI_ERROR (Status));
diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/CpuDriver.h b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/CpuDriver.h
index e5b952f938..c9f04e1ea1 100644
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/CpuDriver.h
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/CpuDriver.h
@@ -24,7 +24,7 @@ Abstract:
 
 
 
-extern UINT8  STRING_ARRAY_NAME[];
+extern UINT8  CpuStrings[];
 
 //
 // Internal Data Structures
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 0442b05b9d..a673d00a22 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -785,14 +785,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>
     
     <sequential>
-      <!-- Lack Dependency Check -->
-      <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">
-        <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>
-      </exec>
-      <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">
-        <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>
-        <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>
-      </concat>
+      <OnDependency>
+        <sourcefiles>
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+        </sourcefiles>
+        <targetfiles>
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.cat"/>
+        </targetfiles>
+  
+        <sequential>
+          <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">
+            <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>
+          </exec>
+          <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">
+            <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>
+            <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>
+          </concat>
+        </sequential>
+      </OnDependency>
     </sequential>
   </macrodef>