diff --git a/tools/AzPreview/AzPreview.psd1 b/tools/AzPreview/AzPreview.psd1
index b9c2beb30578..af8bd311588a 100644
--- a/tools/AzPreview/AzPreview.psd1
+++ b/tools/AzPreview/AzPreview.psd1
@@ -151,7 +151,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.15.1'; },
             @{ModuleName = 'Az.ManagementPartner'; RequiredVersion = '0.7.3'; }, 
             @{ModuleName = 'Az.Maps'; RequiredVersion = '0.8.0'; }, 
             @{ModuleName = 'Az.MariaDb'; RequiredVersion = '0.2.1'; }, 
-            @{ModuleName = 'Az.Marketplace'; RequiredVersion = '0.3.0'; }, 
+            @{ModuleName = 'Az.Marketplace'; RequiredVersion = '0.4.0'; }, 
             @{ModuleName = 'Az.MarketplaceOrdering'; RequiredVersion = '2.0.0'; }, 
             @{ModuleName = 'Az.Media'; RequiredVersion = '1.1.2'; }, 
             @{ModuleName = 'Az.Migrate'; RequiredVersion = '2.3.0'; }, 
diff --git a/tools/CheckSignature.ps1 b/tools/CheckSignature.ps1
index 419412998b13..7e26083e843f 100644
--- a/tools/CheckSignature.ps1
+++ b/tools/CheckSignature.ps1
@@ -94,7 +94,7 @@ function Check-All {
         Write-Host "Found $($invalidAuthenticodeList.Count) files with an invalid authenticode signature." -ForegroundColor Red
     }
     else {
-        Write-Host "All files (.dll, .ps1, .psd1) have a valid authenticode signature." -ForegroundColor Green
+        Write-Host "All files (.dll, .ps1, .psm1) have a valid authenticode signature." -ForegroundColor Green
     }
 
     if ($invalidList.Length -gt 0) {
@@ -213,4 +213,4 @@ else
     Write-Host "No switch parameter set - checking all files in current directory" -ForegroundColor Yellow
 }
 
-Check-All $path
\ No newline at end of file
+Check-All $path
diff --git a/tools/Docs/az-ps-latest.csv b/tools/Docs/az-ps-latest.csv
index ef15526c0aa9..5ad9277b6a59 100644
--- a/tools/Docs/az-ps-latest.csv
+++ b/tools/Docs/az-ps-latest.csv
@@ -97,7 +97,7 @@ pac95,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-relea
 pac96,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.ManagementPartner.0.7.3.nupkg;sourceType=sa]Az.ManagementPartner,0.7.3
 pac97,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Maps.0.8.0.nupkg;sourceType=sa]Az.Maps,0.8.0
 pac98,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.MariaDb.0.2.1.nupkg;sourceType=sa]Az.MariaDb,0.2.1
-pac99,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Marketplace.0.3.0.nupkg;sourceType=sa]Az.Marketplace,0.3.0
+pac99,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Marketplace.0.4.0.nupkg;sourceType=sa]Az.Marketplace,0.4.0
 pac100,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.MarketplaceOrdering.2.0.0.nupkg;sourceType=sa]Az.MarketplaceOrdering,2.0.0
 pac101,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Media.1.1.2.nupkg;sourceType=sa]Az.Media,1.1.2
 pac102,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Migrate.2.3.0.nupkg;sourceType=sa]Az.Migrate,2.3.0
diff --git a/tools/ExpandModules.ps1 b/tools/ExpandModules.ps1
index c0658ba56545..67efb8bcc8e0 100644
--- a/tools/ExpandModules.ps1
+++ b/tools/ExpandModules.ps1
@@ -48,7 +48,7 @@ try {
     }
     foreach ($package in $AllPackages) {
         foreach ($module in $ModifiedModules) {
-            if ($package.Name -like "*$module*") { 
+            if (($package.Name -like "*$module*") -or ($package.Name -match '^Az(Preview)?\.\d+\.\d+\.\d+\.nupkg$')) { 
                 $module_name = $package.Name
                 $zip_artifact = $package.FullName -replace ".nupkg$",".zip"
                 Write-Output "Renaming $package to zip archive $zip_artifact"