diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index ec2db718e3..ada68752b9 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -7330,7 +7330,7 @@
     </concat>
     <!--Generate Run.cmd file. This file will call SecMain.exe to start shell.-->
     <pathconvert property="SecMainPath" targetos="windows">
-      <path path="${FV_DIR}/../IA32"/>
+      <path path="${TARGET_DIR}/IA32"/>
     </pathconvert>
     <echo file="${PLATFORM_DIR}/run.cmd">@REM
       @REM Copyright (c) 2006, Intel Corporation
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 0de9f321f3..280a1c088a 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -1167,8 +1167,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>
 
     <sequential>
-      <mkdir dir="${BUILD_DIR}/${TARGET}_${TOOLCHAIN}/Microcode"/>
-      <flashmap MCIFile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" MCOFILE="${BUILD_DIR}/${TARGET}_${TOOLCHAIN}/Microcode/@{FILENAME}.bin"/>
+      <mkdir dir="${TARGET_DIR}/Microcode"/>
+      <flashmap MCIFile="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" MCOFILE="${TARGET_DIR}/Microcode/@{FILENAME}.bin"/>
     </sequential>
   </macrodef>