diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index 88a2ee2b16..2f5b7539e4 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -1,3 +1,5 @@
+#if !LINUX
+
 /********************************************************************++
 Copyright (c) Microsoft Corporation.  All rights reserved.
 --********************************************************************/
@@ -7384,3 +7386,5 @@ $result
     #endregion
 
 }//End namespace
+
+#endif
diff --git a/src/Microsoft.PowerShell.Commands.Management/map.json b/src/Microsoft.PowerShell.Commands.Management/map.json
index 3e0402ac79..95929d0b19 100644
--- a/src/Microsoft.PowerShell.Commands.Management/map.json
+++ b/src/Microsoft.PowerShell.Commands.Management/map.json
@@ -85,6 +85,8 @@
     "monad/src/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs":  "cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs",
     "monad/src/commands/management/ParsePathCommand.cs":  "commands/management/ParsePathCommand.cs",
     "monad/src/commands/management/CopyPropertyCommand.cs":  "commands/management/CopyPropertyCommand.cs",
+    "monad/src/commands/management/TimeZoneCommands.cs":  "commands/management/TimeZoneCommands.cs",
+    "monad/src/commands/management/resources/TimeZoneResources.resx":  "resources/TimeZoneResources.resx",
     "monad/src/cimSupport/cmdletization/cim/TerminatingErrorTracker.cs":  "cimSupport/cmdletization/cim/TerminatingErrorTracker.cs",
     "monad/src/cimSupport/cmdletization/cim/cimChildJobBase.cs":  "cimSupport/cmdletization/cim/cimChildJobBase.cs"
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json
index 8f42c2664f..1ff98e371b 100644
--- a/src/Microsoft.PowerShell.Commands.Management/project.json
+++ b/src/Microsoft.PowerShell.Commands.Management/project.json
@@ -10,6 +10,14 @@
         "allowUnsafe": true
     },
 
+    "configurations": {
+        "Linux": {
+            "buildOptions": {
+                "define": [ "LINUX" ]
+            }
+        }
+    },
+
     "dependencies": {
         "Microsoft.PowerShell.Security": "1.0.0-*"
     },
@@ -24,7 +32,6 @@
                         "commands/management/ClearRecycleBinCommand.cs",
                         "commands/management/ControlPanelItemCommand.cs",
                         "commands/management/CommitTransactionCommand.cs",
-                        "commands/management/Computer.cs",
                         "commands/management/Eventlog.cs",
                         "commands/management/GetClipboardCommand.cs",
                         "commands/management/GetTransactionCommand.cs",
diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json
index 3086becd3c..2dcd773a90 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/project.json
+++ b/src/Microsoft.PowerShell.Commands.Utility/project.json
@@ -41,12 +41,16 @@
                         "commands/utility/ShowCommand/ShowCommandProxy.cs",
                         "commands/utility/WebCmdlet/BasicHtmlWebResponseObject.cs",
                         "commands/utility/WebCmdlet/ContentHelper.cs",
+                        "commands/utility/WebCmdlet/FormObject.cs",
+                        "commands/utility/WebCmdlet/FormObjectCollection.cs",
                         "commands/utility/WebCmdlet/HtmlWebResponseObject.cs",
                         "commands/utility/WebCmdlet/InvokeRestMethodCommand.cs",
                         "commands/utility/WebCmdlet/InvokeWebRequestCommand.cs",
                         "commands/utility/WebCmdlet/JsonObjectTypeResolver.cs",
                         "commands/utility/WebCmdlet/PSUserAgent.cs",
                         "commands/utility/WebCmdlet/StreamHelper.cs",
+                        "commands/utility/WebCmdlet/WebCmdletElementCollection.cs",
+                        "commands/utility/WebCmdlet/WebRequestMethod.cs",
                         "commands/utility/WebCmdlet/WebRequestPSCmdlet.cs",
                         "commands/utility/WebCmdlet/WebRequestSession.cs",
                         "commands/utility/WebCmdlet/WebResponseHelper.cs",
diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json
index 297cdfa423..776f1d9aef 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/project.json
+++ b/src/Microsoft.PowerShell.ConsoleHost/project.json
@@ -68,7 +68,13 @@
         "netstandard1.6": {
             "imports": [ "dnxcore50", "portable-net45+win8" ],
             "buildOptions": {
-                "define": [ "CORECLR", "PORTABLE" ]
+                "define": [ "CORECLR" ],
+                "compile": {
+                    "exclude": [
+                        "singleshell/installer/EngineInstaller.cs",
+                        "singleshell/installer/MshHostMshSnapin.cs"
+                    ]
+                }
             },
             "dependencies": {
                 "Newtonsoft.Json": "7.0.1",
diff --git a/src/Microsoft.PowerShell.ConsoleHost/singleshell/installer/EngineInstaller.cs b/src/Microsoft.PowerShell.ConsoleHost/singleshell/installer/EngineInstaller.cs
index 3e7971855f..bcc5467e64 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/singleshell/installer/EngineInstaller.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/singleshell/installer/EngineInstaller.cs
@@ -1,4 +1,3 @@
-#if !PORTABLE
 /********************************************************************++
 Copyright (c) Microsoft Corporation.  All rights reserved.
 --********************************************************************/
@@ -87,4 +86,3 @@ namespace Microsoft.PowerShell
         }
     }
 }
-#endif
diff --git a/src/Microsoft.PowerShell.ConsoleHost/singleshell/installer/MshHostMshSnapin.cs b/src/Microsoft.PowerShell.ConsoleHost/singleshell/installer/MshHostMshSnapin.cs
index 0b9a0f65e2..615d5dfc26 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/singleshell/installer/MshHostMshSnapin.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/singleshell/installer/MshHostMshSnapin.cs
@@ -1,4 +1,3 @@
-#if !PORTABLE
 /********************************************************************++
 Copyright (c) Microsoft Corporation.  All rights reserved.
 --********************************************************************/
@@ -93,4 +92,3 @@ namespace Microsoft.PowerShell
         }
     }
 }
-#endif
diff --git a/src/Microsoft.PowerShell.Security/map.json b/src/Microsoft.PowerShell.Security/map.json
index 28288e6dd5..5a7c57668f 100644
--- a/src/Microsoft.PowerShell.Security/map.json
+++ b/src/Microsoft.PowerShell.Security/map.json
@@ -17,5 +17,6 @@
     "monad/src/security/ExecutionPolicyCommands.cs":  "security/ExecutionPolicyCommands.cs",
     "monad/src/security/CmsCommands.cs":  "security/CmsCommands.cs",
     "monad/src/security/AclCommands.cs":  "security/AclCommands.cs",
+    "monad/src/security/CatalogCommands.cs":  "security/CatalogCommands.cs",
     "monad/src/security/resources/SignatureCommands.resx":  "resources/SignatureCommands.resx"
 }
diff --git a/src/System.Management.Automation/map.json b/src/System.Management.Automation/map.json
index 686728edb2..75cdaf758b 100644
--- a/src/System.Management.Automation/map.json
+++ b/src/System.Management.Automation/map.json
@@ -743,6 +743,8 @@
     "monad/src/namespaces/Buffer.cs":  "namespaces/Buffer.cs",
     "monad/src/engine/interpreter/LocalAccess.cs":  "engine/interpreter/LocalAccess.cs",
     "monad/src/security/SecuritySupport.cs":  "security/SecuritySupport.cs",
+    "monad/src/security/CatalogHelper.cs":  "security/CatalogHelper.cs",
+    "monad/src/engine/resources/CatalogStrings.resx": "resources/CatalogStrings.resx",
     "monad/src/engine/remoting/client/remotepipeline.cs":  "engine/remoting/client/remotepipeline.cs",
     "monad/src/engine/remoting/common/remotingexceptions.cs":  "engine/remoting/common/remotingexceptions.cs",
     "monad/src/help/BaseCommandHelpInfo.cs":  "help/BaseCommandHelpInfo.cs",