diff --git a/src/game_events.cpp b/src/game_events.cpp
index a4c1a18a81b..c7ba8af9510 100644
--- a/src/game_events.cpp
+++ b/src/game_events.cpp
@@ -532,7 +532,7 @@ namespace {
 
 } // end anonymous namespace (2)
 
-static bool events_init() { return game_events::resources->screen; }
+static bool events_init() { return game_events::resources->screen != 0; }
 
 namespace {
 
diff --git a/src/gui/widgets/window.hpp b/src/gui/widgets/window.hpp
index 07494e3fabb..fa13d30718b 100644
--- a/src/gui/widgets/window.hpp
+++ b/src/gui/widgets/window.hpp
@@ -59,7 +59,7 @@ class twindow
 	, public cursor::setter
 {
 	friend class tdebug_layout_graph;
-	friend class twindow_implementation;
+	friend struct twindow_implementation;
 
 	// Wants to use layout().
 	friend class tmessage;
diff --git a/src/multiplayer.cpp b/src/multiplayer.cpp
index 76a6fbf7710..c3f06d7ad2c 100644
--- a/src/multiplayer.cpp
+++ b/src/multiplayer.cpp
@@ -216,7 +216,7 @@ static server_type open_connection(game_display& disp, const std::string& origin
 					std::string password = preferences::password();
 
 					bool fall_through = (*error)["force_confirmation"] == "yes" ?
-						gui::dialog(disp,_("Confirm"),(*error)["message"],gui::OK_CANCEL).show() :
+						(gui::dialog(disp,_("Confirm"),(*error)["message"],gui::OK_CANCEL).show() != 0) :
 						false;
 
 					const bool is_pw_request = !((*error)["password_request"].empty()) && !(password.empty());