diff --git a/API/API.csproj b/API/API.csproj
index 7d2707e28..74bf6fbbc 100644
--- a/API/API.csproj
+++ b/API/API.csproj
@@ -73,7 +73,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Kavita.Common\Kavita.Common.csproj" />
-    <Content Condition=" '$(Configuration)' == 'Release' " Include="appsettings.json" />
   </ItemGroup>
 
   
@@ -118,6 +117,9 @@
     <Content Remove="temp\**" />
     <Content Remove="stats\**" />
     <Content Condition=" '$(Configuration)' == 'Release' " Remove="appsettings.Development.json" />
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/API/Services/MetadataService.cs b/API/Services/MetadataService.cs
index fe2a27172..aa175c021 100644
--- a/API/Services/MetadataService.cs
+++ b/API/Services/MetadataService.cs
@@ -20,7 +20,7 @@ namespace API.Services
         private readonly IArchiveService _archiveService;
         private readonly IBookService _bookService;
         private readonly IImageService _imageService;
-        private readonly ChapterSortComparer _chapterSortComparer = new ChapterSortComparer();
+        private readonly ChapterSortComparerZeroFirst _chapterSortComparerForInChapterSorting = new ChapterSortComparerZeroFirst();
         /// <summary>
         /// Width of the Thumbnail generation
         /// </summary>
@@ -102,7 +102,7 @@ namespace API.Services
                 , false)) return;
 
             volume.Chapters ??= new List<Chapter>();
-            var firstChapter = volume.Chapters.OrderBy(x => double.Parse(x.Number), _chapterSortComparer).FirstOrDefault();
+            var firstChapter = volume.Chapters.OrderBy(x => double.Parse(x.Number), _chapterSortComparerForInChapterSorting).FirstOrDefault();
 
             if (firstChapter == null) return;
 
@@ -127,13 +127,13 @@ namespace API.Services
                     // If firstCover is null and one volume, the whole series is Chapters under Vol 0.
                     if (series.Volumes.Count == 1)
                     {
-                        coverImage = series.Volumes[0].Chapters.OrderBy(c => double.Parse(c.Number), _chapterSortComparer)
+                        coverImage = series.Volumes[0].Chapters.OrderBy(c => double.Parse(c.Number), _chapterSortComparerForInChapterSorting)
                             .FirstOrDefault(c => !c.IsSpecial)?.CoverImage;
                     }
 
                     if (!HasCoverImage(coverImage))
                     {
-                        coverImage = series.Volumes[0].Chapters.OrderBy(c => double.Parse(c.Number), _chapterSortComparer)
+                        coverImage = series.Volumes[0].Chapters.OrderBy(c => double.Parse(c.Number), _chapterSortComparerForInChapterSorting)
                             .FirstOrDefault()?.CoverImage;
                     }
                 }
diff --git a/Dockerfile b/Dockerfile
index 496db0002..a1d36ee56 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,8 +26,7 @@ RUN apt-get update \
 #Creates the data directory
 RUN mkdir /kavita/data
 
-RUN cp /kavita/appsettings.Development.json /kavita/appsettings.json \
-  && sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json
+RUN sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json
 
 COPY entrypoint.sh /entrypoint.sh
 
diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj
index 5b68eb51a..b10ce71a6 100644
--- a/Kavita.Common/Kavita.Common.csproj
+++ b/Kavita.Common/Kavita.Common.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net5.0</TargetFramework>
         <Company>kavitareader.com</Company>
         <Product>Kavita</Product>
-        <AssemblyVersion>0.4.4.4</AssemblyVersion>
+        <AssemblyVersion>0.4.4.7</AssemblyVersion>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>
 
diff --git a/build.sh b/build.sh
index d2ff49006..2e76cfdf0 100755
--- a/build.sh
+++ b/build.sh
@@ -97,7 +97,15 @@ Package()
     cp ../LICENSE "$lOutputFolder"/LICENSE.txt
 
     echo "Renaming API -> Kavita"
-    mv "$lOutputFolder"/API "$lOutputFolder"/Kavita
+    if [ $runtime == "win-x64" ] || [ $runtime == "win-x86" ]
+    then
+        mv "$lOutputFolder"/API.exe "$lOutputFolder"/Kavita.exe
+    else
+        mv "$lOutputFolder"/API "$lOutputFolder"/Kavita
+    fi
+
+    echo "Copying appsettings.json"
+    cp appsettings.Development.json $lOutputFolder/appsettings.json
 
     echo "Creating tar"
     cd ../$outputFolder/"$runtime"/
diff --git a/monorepo-build.sh b/monorepo-build.sh
index 826184a04..be452b235 100755
--- a/monorepo-build.sh
+++ b/monorepo-build.sh
@@ -56,6 +56,9 @@ Package()
 
     echo "Show API structure"
     find
+	
+	echo "Copying appsettings.json"
+    cp appsettings.Development.json $lOutputFolder/appsettings.json
 
     echo "Creating tar"
     cd ../$outputFolder/"$runtime"/