diff --git a/DfciDutFiles/BuildDfci.py b/DfciDutFiles/BuildDfci.py
index 2affa4549b..5fc0ae2c76 100644
--- a/DfciDutFiles/BuildDfci.py
+++ b/DfciDutFiles/BuildDfci.py
@@ -18,7 +18,7 @@
     args = " BLD_*_GUI_FRONT_PAGE=TRUE"
     args += " BLD_*_NETWORK_ALLOW_HTTP_CONNECTIONS=TRUE"
     args += " BLD_*_QEMU_CORE_NUM=4"
-    args += " BLD_*_SMM_ENABLED=FALSE"
+    args += " BLD_*_SMM_ENABLED=TRUE"
     args += " --clean"
 
     cmd = platformbuild + args
diff --git a/DfciDutFiles/RunDfci.py b/DfciDutFiles/RunDfci.py
index 10a81bfc27..e7da665c51 100644
--- a/DfciDutFiles/RunDfci.py
+++ b/DfciDutFiles/RunDfci.py
@@ -60,7 +60,7 @@
         args += " ALT_BOOT_ENABLE=TRUE"
 
     args += " BLD_*_QEMU_CORE_NUM=4"
-    args += " BLD_*_SMM_ENABLED=FALSE"
+    args += " BLD_*_SMM_ENABLED=TRUE"
 
     cmd = platformbuild + args
     os.system(cmd)
diff --git a/Platforms/QemuQ35Pkg/Plugins/QemuRunner/QemuRunner.py b/Platforms/QemuQ35Pkg/Plugins/QemuRunner/QemuRunner.py
index 895170e025..0719cddd49 100644
--- a/Platforms/QemuQ35Pkg/Plugins/QemuRunner/QemuRunner.py
+++ b/Platforms/QemuQ35Pkg/Plugins/QemuRunner/QemuRunner.py
@@ -86,7 +86,8 @@ def Runner(env):
                 accel = ",accel=whpx"
 
         args += " -machine q35,smm=" + smm_enabled + accel
-        if env.GetValue("PATH_TO_OS") is not None:
+        path_to_os = env.GetValue("PATH_TO_OS")
+        if path_to_os is not None:
             # Potentially dealing with big daddy, give it more juice...
             args += " -m 8192"
             #args += " -hda \"" + path_to_os + "\""