diff --git a/src/hotkey/hotkey_handler.cpp b/src/hotkey/hotkey_handler.cpp
index a04750e8ef3..d6ff7876544 100644
--- a/src/hotkey/hotkey_handler.cpp
+++ b/src/hotkey/hotkey_handler.cpp
@@ -79,7 +79,7 @@ void play_controller::hotkey_handler::objectives(){
 }
 
 void play_controller::hotkey_handler::show_statistics(){
-	menu_handler_.show_statistics(gui()->viewing_team_index()+1);
+	menu_handler_.show_statistics(gui()->viewing_team().side());
 }
 
 void play_controller::hotkey_handler::unit_list(){
diff --git a/src/hotkey/hotkey_handler_sp.cpp b/src/hotkey/hotkey_handler_sp.cpp
index ef73373338c..54bb4abfd61 100644
--- a/src/hotkey/hotkey_handler_sp.cpp
+++ b/src/hotkey/hotkey_handler_sp.cpp
@@ -71,11 +71,11 @@ void playsingle_controller::hotkey_handler::recall(){
 }
 
 void playsingle_controller::hotkey_handler::toggle_shroud_updates(){
-	menu_handler_.toggle_shroud_updates(gui()->viewing_team_index()+1);
+	menu_handler_.toggle_shroud_updates(gui()->viewing_team().side());
 }
 
 void playsingle_controller::hotkey_handler::update_shroud_now(){
-	menu_handler_.update_shroud_now(gui()->viewing_team_index()+1);
+	menu_handler_.update_shroud_now(gui()->viewing_team().side());
 }
 
 void playsingle_controller::hotkey_handler::end_turn(){
diff --git a/src/mouse_events.cpp b/src/mouse_events.cpp
index 5e7288743ab..e1ddaceaafe 100644
--- a/src/mouse_events.cpp
+++ b/src/mouse_events.cpp
@@ -1518,7 +1518,7 @@ bool mouse_handler::unit_in_cycle(unit_map::const_iterator it)
 		return false;
 	}
 
-	if(current_team().is_enemy(static_cast<int>(gui().viewing_team_index() + 1)) && it->invisible(it->get_location())) {
+	if(current_team().is_enemy(gui().viewing_team().side()) && it->invisible(it->get_location())) {
 		return false;
 	}