diff --git a/.pipelines/applyXamlStyling.ps1 b/.pipelines/applyXamlStyling.ps1
index 8a9dd1b1df..e47edd0c0f 100644
--- a/.pipelines/applyXamlStyling.ps1
+++ b/.pipelines/applyXamlStyling.ps1
@@ -117,7 +117,10 @@ else
         {
             Write-Error 'XAML Styling is incorrect, please run `.\.pipelines\applyXamlStyling.ps1 -Main` locally.'
         }
-
+        if ($lastExitCode -lt 0)
+        {
+            Write-Error "Error running dotnet tool run, with the exit code $lastExitCode. Please verify logs and running environment."
+        }
         # Return XAML Styler Status
         exit $lastExitCode
     }
diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
index d24158658b..565ba3cab7 100644
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -127,12 +127,10 @@ jobs:
         Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters"
       displayName: Prepare MSBuildCache variables
 
-  - ${{ if eq(parameters.codeSign, true) }}:
-    # Only required if we're using ESRP
-    - template: steps-ensure-dotnet-version.yml
-      parameters:
-        sdk: true
-        version: '6.0'
+  - template: steps-ensure-dotnet-version.yml
+    parameters:
+      sdk: true
+      version: '6.0'
 
   - template: steps-ensure-dotnet-version.yml
     parameters:
diff --git a/.pipelines/verifyNugetPackages.ps1 b/.pipelines/verifyNugetPackages.ps1
index 1fcc5237f0..54d0137121 100644
--- a/.pipelines/verifyNugetPackages.ps1
+++ b/.pipelines/verifyNugetPackages.ps1
@@ -8,6 +8,12 @@ Write-Host "Verifying Nuget packages for $solution"
 
 dotnet tool restore
 dotnet consolidate -s $solution
+if ($lastExitCode -ne 0)
+{
+    $result = $lastExitCode
+    Write-Error "Error running dotnet consolidate, with the exit code $lastExitCode. Please verify logs and running environment."
+    exit $result
+}
 
 if (-not $?)
 {
diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml b/src/modules/launcher/PowerLauncher/MainWindow.xaml
index 30acc5c3c0..c8f1111e06 100644
--- a/src/modules/launcher/PowerLauncher/MainWindow.xaml
+++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml
@@ -72,10 +72,10 @@
                 x:Name="pluginsHintsList"
                 Grid.Row="1"
                 Margin="16,0,0,0"
+                Background="Transparent"
+                BorderBrush="Transparent"
                 ItemContainerStyle="{StaticResource PluginsListViewItemStyle}"
                 ItemsSource="{Binding Plugins}"
-                Background="Transparent"
-                BorderBrush="Transparent"
                 PreviewMouseLeftButtonUp="PluginsHintsList_PreviewMouseLeftButtonUp"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                 ScrollViewer.VerticalScrollBarVisibility="Auto"
diff --git a/src/modules/launcher/PowerLauncher/ResultList.xaml b/src/modules/launcher/PowerLauncher/ResultList.xaml
index 7e387e9807..b829d5218f 100644
--- a/src/modules/launcher/PowerLauncher/ResultList.xaml
+++ b/src/modules/launcher/PowerLauncher/ResultList.xaml
@@ -32,9 +32,9 @@
     <ListView
         x:Name="SuggestionsList"
         x:FieldModifier="public"
-        BorderBrush="Transparent"
-        Background="Transparent"
         AutomationProperties.Name="{x:Static p:Resources.Results}"
+        Background="Transparent"
+        BorderBrush="Transparent"
         ItemsSource="{Binding Results.Results, Mode=OneWay}"
         ScrollViewer.HorizontalScrollBarVisibility="Disabled"
         ScrollViewer.VerticalScrollBarVisibility="Auto"