diff --git a/OrchardCore/Initialize-OrchardCoreSolution/Initialize-OrchardCoreSolution.psm1 b/OrchardCore/Initialize-OrchardCoreSolution/Initialize-OrchardCoreSolution.psm1
index faeb68e..80fd107 100644
--- a/OrchardCore/Initialize-OrchardCoreSolution/Initialize-OrchardCoreSolution.psm1
+++ b/OrchardCore/Initialize-OrchardCoreSolution/Initialize-OrchardCoreSolution.psm1
@@ -42,23 +42,23 @@ function Initialize-OrchardCoreSolution
             dotnet new install OrchardCore.ProjectTemplates::2.2.0 --nuget-source $NuGetSource
         }
 
-        dotnet new occms -o "$Path/src/$Name.Web"
+        dotnet new occms --output "$Path/src/$Name.Web"
 
-        dotnet new sln -o "$Path" -n "$Name"
-        dotnet sln "$Path/$Name.sln" add "$Path/src/$Name.Web/$Name.Web.csproj"
+        dotnet new sln --output "$Path" --name "$Name" --format slnx
+        dotnet sln "$Path/$Name.slnx" add "$Path/src/$Name.Web/$Name.Web.csproj"
 
         if (-not [string]::IsNullOrEmpty($ModuleName))
         {
-            dotnet new ocmodulecms -n "$ModuleName" -o "$Path/src/Modules/$ModuleName"
+            dotnet new ocmodulecms --name "$ModuleName" --output "$Path/src/Modules/$ModuleName"
             dotnet add "$Path/src/$Name.Web/$Name.Web.csproj" reference "$Path/src/Modules/$ModuleName/$ModuleName.csproj"
-            dotnet sln "$Path/$Name.sln" add "$Path/src/Modules/$ModuleName/$ModuleName.csproj"
+            dotnet sln "$Path/$Name.slnx" add "$Path/src/Modules/$ModuleName/$ModuleName.csproj"
         }
 
         if (-not [string]::IsNullOrEmpty($ThemeName))
         {
-            dotnet new octheme -n "$ThemeName" -o "$Path/src/Themes/$ThemeName"
+            dotnet new octheme --name "$ThemeName" --output "$Path/src/Themes/$ThemeName"
             dotnet add "$Path/src/$Name.Web/$Name.Web.csproj" reference "$Path/src/Themes/$ThemeName/$ThemeName.csproj"
-            dotnet sln "$Path/$Name.sln" add "$Path/src/Themes/$ThemeName/$ThemeName.csproj"
+            dotnet sln "$Path/$Name.slnx" add "$Path/src/Themes/$ThemeName/$ThemeName.csproj"
         }
 
         Copy-Item "$PSScriptRoot\.gitignore.template" -Destination "$Path\.gitignore"
diff --git a/OrchardCore/Reset-OrchardCoreApp/Reset-OrchardCoreApp.psm1 b/OrchardCore/Reset-OrchardCoreApp/Reset-OrchardCoreApp.psm1
index ffbd1c5..c6ceded 100644
--- a/OrchardCore/Reset-OrchardCoreApp/Reset-OrchardCoreApp.psm1
+++ b/OrchardCore/Reset-OrchardCoreApp/Reset-OrchardCoreApp.psm1
@@ -39,7 +39,7 @@ function Reset-OrchardCoreApp
 
         [int] $Port = 5000,
 
-        [Parameter(ParameterSetName = 'ServerDB', Mandatory)]
+        [Parameter(ParameterSetName = 'ServerDB')]
         [string] [ValidateSet('SqlConnection')] $SetupDatabaseProvider = 'Sqlite',
 
         [Parameter(ParameterSetName = 'ServerDB')]