diff --git a/cm_changelog.txt b/cm_changelog.txt
index c567f563d0..e64a85e536 100644
--- a/cm_changelog.txt
+++ b/cm_changelog.txt
@@ -74,7 +74,7 @@ This is usable for any OpenTTD servers
 
 == CHANGELOG ==
 
-*** 1.10.0-RC1 (1 Apr 2020) ***
+*** 1.10.0 (1 Apr 2020) ***
 - OpenTTD update.
 
 *** 1.10.0-RC1 (18 Mar 2020) ***
diff --git a/src/goal.cpp b/src/goal.cpp
index 9c9441e9ee..02ec85255f 100644
--- a/src/goal.cpp
+++ b/src/goal.cpp
@@ -244,7 +244,7 @@ CommandCost CmdSetGoalCompleted(TileIndex tile, DoCommandFlag flags, uint32 p1,
  */
 CommandCost CmdGoalQuestion(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	uint16 uniqueid = (GoalType)GB(p1, 0, 16);
+	uint16 uniqueid = (uint16)GB(p1, 0, 16);
 	CompanyID company = (CompanyID)GB(p1, 16, 8);
 	ClientID client = (ClientID)GB(p1, 16, 16);
 
diff --git a/src/rev.cpp b/src/rev.cpp
index 8d69da7c06..34f55e4181 100644
--- a/src/rev.cpp
+++ b/src/rev.cpp
@@ -83,4 +83,4 @@ const byte _openttd_revision_tagged = 1;
 const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | 1 << 19 | 28004;
 
 
-const char _citymania_version[] = "20200401-master-m4cccc370e9 01.04.20";
+const char _citymania_version[] = "20200401-master-m7942f63772 10.04.20";