diff --git a/base/_ls.ps1 b/base.linux/_ls.ps1
similarity index 100%
rename from base/_ls.ps1
rename to base.linux/_ls.ps1
diff --git a/base.win/Generate-FancyZones.ps1 b/base.win/Generate-FancyZones.ps1
index 90db4de..b303a56 100644
--- a/base.win/Generate-FancyZones.ps1
+++ b/base.win/Generate-FancyZones.ps1
@@ -119,7 +119,7 @@ if( $AutoSections ) {
             $pairs = , $pairs
         }
         foreach( $local:s in $pairs ) {
-            Write-Verbose "$p : $($s | Join-String ", ")"
+            Write-Verbose "$p : $($s | Join-String -Separator ", ")"
             $fancyZone.info.zones += [ordered]@{
                 X = [Math]::Round(($s[0] - 1) * $wFactor,0)
                 Y = [Math]::Round(($s[1] - 1) * $hFactor,0)
@@ -149,7 +149,7 @@ if( -not $WhatIf -and -not $WhatIfPreference ) {
     if( -not (Test-Path "$fzJsonPath.bak") ) {
         Copy-Item $fzJsonPath "$fzJsonPath.bak"
     }
-    $fzJson | ConvertTo-Json -Depth 5 | Out-File $fzJsonPath
+    $fzJson | ConvertTo-Json -Depth 5 | ForEach-Object { $_ -replace '\.0(,?\r?\n)','$1' } | Out-File $fzJsonPath
 } else {
-    $fancyZone | ConvertTo-Json -Depth 5
+    $fancyZone | ConvertTo-Json -Depth 5 | ForEach-Object { $_ -replace '\.0(,?\r?\n)','$1' }
 }
\ No newline at end of file
diff --git a/base.win/_.package.json b/base.win/_.package.json
index cc175ac..c822155 100644
--- a/base.win/_.package.json
+++ b/base.win/_.package.json
@@ -4,7 +4,7 @@
     "Condition": [
       {
         "System": [
-          "Desktop"
+          "Desktop","Windows"
         ]
       }
     ]