diff --git a/.ottdrev b/.ottdrev
deleted file mode 100644
index dab280a505..0000000000
--- a/.ottdrev
+++ /dev/null
@@ -1 +0,0 @@
-15.0-beta1	20241224	0	cd0e1fc47de2095cc0642d73ad5d42db35a63d43	1	0
diff --git a/src/citymania/cm_event.hpp b/src/citymania/cm_event.hpp
index d1b2dddd3e..1bb5378bd1 100644
--- a/src/citymania/cm_event.hpp
+++ b/src/citymania/cm_event.hpp
@@ -8,6 +8,7 @@
 #include "../company_type.h"
 #include "../economy_type.h"
 #include "../industry_type.h"
+#include "../source_type.h"
 #include "../station_type.h"
 #include "../town_type.h"
 
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index c2a6c3937a..672dbaa87a 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -7,11 +7,11 @@
 
 /** @file rev.cpp Autogenerated file with the revision and such of OpenTTD. */
 
-#include "/home/dp/Downloads/openttd-15.0-beta2/src/stdafx.h"
-#include "/home/dp/Downloads/openttd-15.0-beta2/src/core/bitmath_func.hpp"
-#include "/home/dp/Downloads/openttd-15.0-beta2/src/rev.h"
+#include "${CMAKE_SOURCE_DIR}/src/stdafx.h"
+#include "${CMAKE_SOURCE_DIR}/src/core/bitmath_func.hpp"
+#include "${CMAKE_SOURCE_DIR}/src/rev.h"
 
-#include "/home/dp/Downloads/openttd-15.0-beta2/src/safeguards.h"
+#include "${CMAKE_SOURCE_DIR}/src/safeguards.h"
 
 /**
  * Is this version of OpenTTD a release version?
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index cadb8c040a..5b775587e9 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -2946,14 +2946,16 @@ static std::optional<SavePreset> ParseSavePreset(const std::string &str)
 
             if (level != Clamp<int>(level, slf.min_compression, slf.max_compression)) {
                 /* Invalid compression level, show the error and use default level */
-                ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR), GetEncodedString(STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL, level_str), WL_CRITICAL);
+                ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR),
+                	GetEncodedString(STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL, level_str), WL_CRITICAL);
                 return SavePreset{&slf, slf.default_compression};
             }
 
             return SavePreset{&slf, (uint8_t)level};
         }
     }
-    ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR), GetEncodedString(STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM, str), WL_CRITICAL);
+    ShowErrorMessage(GetEncodedString(STR_CONFIG_ERROR),
+    	GetEncodedString(STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM, str), WL_CRITICAL);
     return {};
 }
 
diff --git a/src/table/settings/citymania_settings.ini b/src/table/settings/citymania_settings.ini
index bf954e5b14..d3caf8b1af 100644
--- a/src/table/settings/citymania_settings.ini
+++ b/src/table/settings/citymania_settings.ini
@@ -5,7 +5,7 @@ static const SettingVariant _citymania_settings_table[] = {
 [templates]
 SDT_VAR    =    SDT_VAR(GameSettings, $var, $type, SettingFlags({$flags}), $def,       $min, $max, $interval, $str, $strhelp, $strval, $pre_cb, $post_cb, $str_cb, $help_cb, $val_cb, $def_cb, $range_cb, $from, $to,        $cat, $extra, $startup),
 [validation]
-SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for GameSettings.$var exceeds storage size");
+SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for citymania::Settings.$var exceeds storage size");
 
 [defaults]
 flags    = SettingFlag::CityMania