diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 3d1071dee6..ac81d2325d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -36,6 +36,7 @@ body:
     description: What things had an issue? Check all that apply.
     multiple: true
     options:
+      - New Save Format (NSF)
       - The bug also exists in RCT2 (vanilla)
       - This bug is specific to multiplayer
       - Building the game
diff --git a/data/language/nl-NL.txt b/data/language/nl-NL.txt
index 1b022c114a..52f2d18e6a 100644
--- a/data/language/nl-NL.txt
+++ b/data/language/nl-NL.txt
@@ -3649,7 +3649,12 @@ STR_6449    :{WINDOW_COLOUR_2}Tracks:
 STR_6450    :{BLACK}“{STRING}”
 STR_6451    :{BLACK}“{STRING}” - {STRING}
 STR_6452    :{WINDOW_COLOUR_2}Verkoopt: {BLACK}{STRING}
-STR_6453    :Versie-informatie kopiëren 
+STR_6453    :Versie-informatie kopiëren
+STR_6454    :Kan de tekst van de lichtkrant niet veranderen…
+STR_6455    :Kan de tekst van dit bord niet veranderen…
+STR_6456    :Reuzenscreenshot
+STR_6457    :Bug rapporteren op GitHub
+STR_6458    :Volgen in het hoofdvenster
 
 #############
 # Scenarios #
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index 8c02d7a80c..513c7300ea 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -65,16 +65,18 @@ namespace Editor
 
     static void object_list_load()
     {
+        auto* context = GetContext();
+
+        // Unload objects first, the repository is re-populated which owns the objects.
+        auto& objectManager = context->GetObjectManager();
+        objectManager.UnloadAll();
+
         // Scan objects if necessary
-        auto context = GetContext();
         const auto& localisationService = context->GetLocalisationService();
         auto& objectRepository = context->GetObjectRepository();
         objectRepository.LoadOrConstruct(localisationService.GetCurrentLanguage());
 
         // Reset loaded objects to just defaults
-        auto& objectManager = context->GetObjectManager();
-        objectManager.UnloadAll();
-
         // Load minimum required objects (like surface and edge)
         for (const auto& entry : MinimumRequiredObjects)
         {
diff --git a/src/openrct2/world/Litter.cpp b/src/openrct2/world/Litter.cpp
index b0e4980c42..5f8ccba8d3 100644
--- a/src/openrct2/world/Litter.cpp
+++ b/src/openrct2/world/Litter.cpp
@@ -121,7 +121,7 @@ static const rct_string_id litterNames[12] = {
 
 rct_string_id Litter::GetName() const
 {
-    if (EnumValue(SubType) >= sizeof(litterNames))
+    if (EnumValue(SubType) >= std::size(litterNames))
         return STR_NONE;
     return litterNames[EnumValue(SubType)];
 }