diff --git a/setup-powershellget/Setup/ShortcutStartup.ps1 b/setup-powershellget/Setup/ShortcutStartup.ps1
index ba35b2cc15c0..8cca43a090df 100644
--- a/setup-powershellget/Setup/ShortcutStartup.ps1
+++ b/setup-powershellget/Setup/ShortcutStartup.ps1
@@ -17,11 +17,30 @@ Param(
 [switch]$Install
 )
 
-cd c:\
-$welcomeMessage = @"
+$error.clear()
+try {
+	if ($Install.IsPresent) {
+		Write-Output @"
+
+Finalizing installation of Azure PowerShell. 
+Installing Azure Modules from PowerShell Gallery. 
+This may take some time...
+"@
+		Get-PackageProvider -Name NuGet -ForceBootstrap
+		Install-Module AzureRM.Installer
+		Install-AzureRM
+	} else {
+		cd c:\
+		$welcomeMessage = @"
 For a list of all Azure cmdlets type 'help azure'.
 For a list of Azure Pack cmdlets type 'Get-Command *wapack*'.
 "@
-Write-Output $welcomeMessage
+		Write-Output $welcomeMessage
 
-$VerbosePreference = "Continue"
\ No newline at end of file
+		$VerbosePreference = "Continue"
+	}
+}
+catch { Write-Output $error }
+if ($error) {
+	Read-Host -Prompt "An error occured during installation. Press any key..."
+}
\ No newline at end of file
diff --git a/setup-powershellget/azurecmd.wxs b/setup-powershellget/azurecmd.wxs
index 8680059fc809..fc9f5f12c862 100644
--- a/setup-powershellget/azurecmd.wxs
+++ b/setup-powershellget/azurecmd.wxs
@@ -102,7 +102,7 @@
     <CustomAction Id="SetCustomActionDataValue" Return="check" Property="UpdatePSShortcut"
                      Value="ShortcutPath=[AzureSdkMenu]Microsoft Azure PowerShell.lnk;DefaultShortcutPath=[ProgramMenuFolder]System Tools\Windows PowerShell.lnk" />
     <CustomAction Id="SetExecutionPolicy" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;Set-ExecutionPolicy RemoteSigned -Force&quot;" Execute="deferred" Impersonate="no" Return="check"/>
-    <CustomAction Id="RunModuleInstallScript" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;\&quot;[PowerShellFolder]\ShortcutStartup.ps1 -Install\&quot;&quot;" Execute="deferred" Impersonate="no" Return="check"/>
+    <CustomAction Id="RunModuleInstallScript" Property="POWERSHELLEXE" ExeCommand="-NoLogo -NoProfile -Command &quot;. \&quot;[PowerShellFolder]\ShortcutStartup.ps1\&quot; -Install&quot;" Execute="deferred" Impersonate="no" Return="check"/>
 
     <InstallExecuteSequence>
       <Custom Action="SetCustomActionDataValue" After="CreateShortcuts">NOT Installed</Custom>
diff --git a/tools/Build.ps1 b/tools/Build.ps1
index 0f7389778785..5dee2cff9a86 100644
--- a/tools/Build.ps1
+++ b/tools/Build.ps1
@@ -15,4 +15,4 @@
 $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 . ($scriptFolder + '.\SetupEnv.ps1')
 
-msbuild "$env:AzurePSRoot\build.proj" /t:BuildDebug
\ No newline at end of file
+msbuild "$env:AzurePSRoot\build.proj" /t:Build
\ No newline at end of file
diff --git a/tools/BuildInstaller.ps1 b/tools/BuildInstaller.ps1
index 1898c28be8cf..7b391af94584 100644
--- a/tools/BuildInstaller.ps1
+++ b/tools/BuildInstaller.ps1
@@ -50,13 +50,8 @@ if ($wixInstallRoot -eq $null){
 #and we just register both 3.8 & 3.5 to simplify the script
 $env:path = $env:path + ";$wixInstallRoot"
 
-# Build the cmdlets in debug mode
-msbuild "$env:AzurePSRoot\build.proj" /t:"BuildDebug"
+# Build the cmdlets and installer in debug mode
+msbuild "$env:AzurePSRoot\build.proj" /t:Build
 
-# Regenerate the installer files
-&"$env:AzurePSRoot\tools\Installer\generate.ps1" 'Debug'
-
-# Build the installer
-msbuild "$env:AzurePSRoot\build.proj" /t:"BuildSetupDebug"
-
-Write-Host "MSI file path: $env:AzurePSRoot\setup\build\Debug\AzurePowerShell.msi"
\ No newline at end of file
+Write-Host "MSI file path: $env:AzurePSRoot\setup\build\Debug\AzurePowerShell.msi"
+Write-Host "MSI for PowerShell Gallery: $env:AzurePSRoot\setup-powershellget\build\Debug\AzurePowerShellGet.msi"
\ No newline at end of file
diff --git a/tools/RunCheckInTests.ps1 b/tools/RunCheckInTests.ps1
index e9f018df4bef..ede1a57f61bc 100644
--- a/tools/RunCheckInTests.ps1
+++ b/tools/RunCheckInTests.ps1
@@ -16,4 +16,4 @@ $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 . ($scriptFolder + '.\SetupTestEnv.ps1')
 
 $env:AZURE_TEST_MODE="Playback"
-msbuild.exe $env:AzurePSRoot\build.proj /t:"Test;BuildSetupDebug"
\ No newline at end of file
+msbuild.exe $env:AzurePSRoot\build.proj /t:Test
\ No newline at end of file
diff --git a/tools/RunMockedScenarioTests.ps1 b/tools/RunMockedScenarioTests.ps1
index 0229dfe9caaf..afe2a204e1f3 100644
--- a/tools/RunMockedScenarioTests.ps1
+++ b/tools/RunMockedScenarioTests.ps1
@@ -15,4 +15,4 @@
 $scriptFolder = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 . ($scriptFolder + '.\SetupTestEnv.ps1')
 
-msbuild.exe $env:AzurePSRoot\build.proj /t:"BuildDebug;BeforeRunTests;MockedScenarioTests"
\ No newline at end of file
+msbuild.exe $env:AzurePSRoot\build.proj /t:"Build;BeforeRunTests;MockedScenarioTests"
\ No newline at end of file