diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml
index a82955748..cfe9b833b 100644
--- a/data/Memory-ng.xml
+++ b/data/Memory-ng.xml
@@ -1966,6 +1966,11 @@
                 <Offset name="custom_workshop_type" value="0x20" /> INVALID?
                 -->
             </Group>
+            <Group name="World" valid="false">
+                <Address name="current_tick" description="Current time of the year" />
+                <Address name="current_year" description="Current year" />
+                <Address name="current_weather" value="0x15027A0" valid="true" />
+            </Group>
             <!--
             <Address name="WORLD" valid="false" />
             <Group name="Maps">
@@ -2003,11 +2008,6 @@
                 <Offset name="item_improvement_quality" />
                 <Offset name="item_type_accessor" />  (in the vtable)
             </Group>
-            <Group name="World" valid="false">
-                <Address name="current_tick" description="Current time of the year" />
-                <Address name="current_year" description="Current year" />
-                <Address name="current_weather" value="0x14c9bb8" valid="true" />
-            </Group>
             -->
         </Offsets>
     </Version>
diff --git a/tools/supported/SegmentedFinder.h b/tools/supported/SegmentedFinder.h
index b4ec7c804..852001165 100644
--- a/tools/supported/SegmentedFinder.h
+++ b/tools/supported/SegmentedFinder.h
@@ -454,7 +454,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
                 {
                     small = reads - '0';
                     state = 0;
-                    bs.insert(big*16 + small);
+                    bs.insert<char>(big*16 + small);
                 }
             }
             if((reads >= 'a' && reads <= 'f'))
@@ -468,7 +468,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
                 {
                     small = reads - 'a' + 10;
                     state = 0;
-                    bs.insert(big*16 + small);
+                    bs.insert<char>(big*16 + small);
                 }
             }
             it++;
@@ -478,7 +478,7 @@ std::istream& operator>> ( std::istream& out, Bytestream& bs )
         if (state == 1)
         {
             small = 0;
-            bs.insert(big*16 + small);
+            bs.insert<char>(big*16 + small);
         }
     }
     else