diff --git a/cm_changelog.txt b/cm_changelog.txt
index b15965944d..ac104d9a4b 100644
--- a/cm_changelog.txt
+++ b/cm_changelog.txt
@@ -74,6 +74,12 @@ This is usable for any OpenTTD servers
 
 == CHANGELOG ==
 
+*** 1.7.0 (12 Apr 2017) ***
+- Polyline patch updated to version 11a
+- Always autorotate drive-through road/tram stops when placed on roads.
+- Added industry type id to newgrf debug window (may be useful for newgrf developers)
+- Added a trick to join servers that have diffirent game version. Hold Ctrl while clicking greyed-out join button and it will work. But still may fail version check later as not all versions are supported. And even if you do manage to join the game keep in mind that it's not supposed to work like that and is highly likely to desync or crash at some point.
+
 *** 1.6.1-2 (29 Jul 2016) ***
 - Fixed crash when joining ECS servers on windows
 
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 64002fc2d6..1b69dfbbd7 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -395,6 +395,7 @@ struct MainWindow : Window
 				break;
 
 			case GHK_BORROW_ALL:
+				fprintf(stderr, "Borow all!\n");
 				DoCommandP(0, 0, 1, CMD_INCREASE_LOAN | CMD_MSG(STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY));
 				break;
 
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 0bf682f6bf..3685f289c3 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -2160,7 +2160,7 @@ struct MainToolbarWindow : Window {
 			case MTHK_CLIENT_LIST: if (_networking) ShowClientList(); break;
 			case MTHK_COMMANDS_GUI: extern bool _novahost; if (_networking && _novahost){ ShowCommandsToolbar(); } break;
 #endif
-			case MTHK_BUILD_HQ: if(_current_company != COMPANY_SPECTATOR){ _last_started_action = CBF_BUILD_HQ; BuildCompanyHQ(); } break;
+			case MTHK_BUILD_HQ: if(_current_company != COMPANY_SPECTATOR){ _last_started_action = BuildCompanyHQ(); } break;
 			case MTHK_CARGOTABLE: if(_current_company != COMPANY_SPECTATOR){ ShowCompanyCargos(_current_company); } break;
 			case MTHK_TREES: if(_current_company != COMPANY_SPECTATOR){ BuildTreesWindow(); } break;
 			case MTHK_SIGN_LIST: ShowSignList(); break;