diff --git a/src/NSwag.CodeGeneration.TypeScript/Models/TypeScriptOperationModel.cs b/src/NSwag.CodeGeneration.TypeScript/Models/TypeScriptOperationModel.cs
index bf9e0f7929..468a9ecea8 100644
--- a/src/NSwag.CodeGeneration.TypeScript/Models/TypeScriptOperationModel.cs
+++ b/src/NSwag.CodeGeneration.TypeScript/Models/TypeScriptOperationModel.cs
@@ -36,13 +36,13 @@ public TypeScriptOperationModel(
             _settings = settings;
             _generator = generator;
 
-            var parameters = GetActualParameters();
+            var parameters = GetActualParameters().OrderBy(p => p.Position).ToList();
 
             if (settings.GenerateOptionalParameters)
             {
                 parameters = parameters
                     .OrderBy(p => p.Position ?? 0)
-                    .OrderBy(p => !p.IsRequired)
+                    .ThenBy(p => !p.IsRequired)
                     .ToList();
             }
 
diff --git a/src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid b/src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid
index 1c86f7f9e1..1a7bfda708 100644
--- a/src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid
+++ b/src/NSwag.CodeGeneration.TypeScript/Templates/File.liquid
@@ -60,7 +60,7 @@ import * as jQuery from 'jquery';
 {%-    endif -%}
 {%-    if Framework.UseMomentJS -%}
 
-import moment from 'moment';
+import * as moment from 'moment';
 {%-        if RequiresMomentJSDuration -%}
 import 'moment-duration-format';
 {%-        endif -%}