diff --git a/src/Microsoft.PowerShell.GraphicalHost/commandHelpers/ShowCommandHelper.cs b/src/Microsoft.PowerShell.GraphicalHost/commandHelpers/ShowCommandHelper.cs
index 43085f4c8f..eb28de82ea 100644
--- a/src/Microsoft.PowerShell.GraphicalHost/commandHelpers/ShowCommandHelper.cs
+++ b/src/Microsoft.PowerShell.GraphicalHost/commandHelpers/ShowCommandHelper.cs
@@ -1303,7 +1303,7 @@ Function PSGetSerializedShowCommandInfo
                 MessageBox.Show(
                     String.Format(
                         CultureInfo.CurrentUICulture,
-                        Microsoft.Management.UI.Internal.ShowCommandResources.EndProcessingErrorMessage,
+                        ShowCommandResources.EndProcessingErrorMessage,
                         errorString),
                      "Show-Command",
                      MessageBoxButton.OK,
diff --git a/src/Microsoft.PowerShell.GraphicalHost/commandHelpers/outgridview.cs b/src/Microsoft.PowerShell.GraphicalHost/commandHelpers/outgridview.cs
index c0a1a08073..c25a951f8f 100644
--- a/src/Microsoft.PowerShell.GraphicalHost/commandHelpers/outgridview.cs
+++ b/src/Microsoft.PowerShell.GraphicalHost/commandHelpers/outgridview.cs
@@ -75,12 +75,12 @@ namespace Microsoft.Management.UI.Internal
         /// <summary>
         /// OK Button's content.
         /// </summary>
-        private static readonly string OKButtonContent = Microsoft.Management.UI.Internal.XamlLocalizableResources.OutGridView_Button_OK;
+        private static readonly string OKButtonContent = XamlLocalizableResources.OutGridView_Button_OK;
         
         /// <summary>
         /// Cancel Button's content.
         /// </summary>
-        private static readonly string CancelButtonContent = Microsoft.Management.UI.Internal.XamlLocalizableResources.OutGridView_Button_Cancel;
+        private static readonly string CancelButtonContent = XamlLocalizableResources.OutGridView_Button_Cancel;
         
         /// <summary>
         /// Used to store selected items in the ok processing
diff --git a/src/Microsoft.PowerShell.GraphicalHost/project.json b/src/Microsoft.PowerShell.GraphicalHost/project.json
index f5bde13701..f71827cde9 100644
--- a/src/Microsoft.PowerShell.GraphicalHost/project.json
+++ b/src/Microsoft.PowerShell.GraphicalHost/project.json
@@ -30,7 +30,11 @@
             "buildOptions": {
                 "compile": {
                     "exclude": [
-                        "ManagementList/CommonControls/ExpanderButtonAutomationPeer.cs"
+                        "ManagementList/CommonControls/ExpanderButtonAutomationPeer.cs",
+                        "ManagementList/CommonControls/ExpanderButton.cs",
+                        "ManagementList/CommonControls/ExpanderButton.Generated.cs",
+                        "ManagementList/Common/PopupControlButton.cs",
+                        "ManagementList/Common/PopupControlButton.Generated.cs"
                     ]
                 }
             }