diff --git a/build.psm1 b/build.psm1
index d48eb97a8..30a0dc415 100644
--- a/build.psm1
+++ b/build.psm1
@@ -156,7 +156,7 @@ function Start-PSBuild {
 
     # handle xaml files
     # Heuristic to resolve xaml on the fresh machine
-    if ($FullCLR -and ($XamlGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.Activities/gen/*.g.resources")))
+    if ($FullCLR -and ($XamlGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.Activities/gen/*.g.cs")))
     {
         log "Run XamlGen (generating .g.cs and .resources for .xaml files)"
         Start-XamlGen -MSBuildConfiguration $msbuildConfiguration
diff --git a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
index 33faeb13c..dd0209b66 100644
--- a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
+++ b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
@@ -1409,7 +1409,7 @@ namespace System.Management.Automation
                                     "SecurityMshSnapInResources,Description","SecurityMshSnapInResources,Vendor")
                             };
 
-#if !LINUX
+#if !PORTABLE
                             if (!Utils.IsWinPEHost())
                             {
                                 defaultMshSnapins.Add(new DefaultPSSnapInInformation("Microsoft.WSMan.Management", "Microsoft.WSMan.Management", null,
diff --git a/test/powershell/engine/BasicEngine.Tests.ps1 b/test/powershell/engine/BasicEngine.Tests.ps1
new file mode 100644
index 000000000..73e4cf705
--- /dev/null
+++ b/test/powershell/engine/BasicEngine.Tests.ps1
@@ -0,0 +1,7 @@
+Describe 'Basic engine APIs' {
+    Context 'powershell::Create' {
+        It 'can create default instance' {
+            [powershell]::Create() | Should Not Be $null
+        }
+    }
+}