diff --git a/client/lobby/OptionsTab.cpp b/client/lobby/OptionsTab.cpp
index 7d16085f4..3892eae44 100644
--- a/client/lobby/OptionsTab.cpp
+++ b/client/lobby/OptionsTab.cpp
@@ -660,7 +660,7 @@ int OptionsTab::SelectionWindow::getElement(const Point & cursorPosition)
 	return x + y * elementsPerLine;
 }
 
-void OptionsTab::SelectionWindow::setElement(int elem, bool apply)
+void OptionsTab::SelectionWindow::setElement(int elem, bool doApply)
 {
 	PlayerSettings set = PlayerSettings();
 	if(type == SelType::TOWN)
@@ -678,7 +678,7 @@ void OptionsTab::SelectionWindow::setElement(int elem, bool apply)
 		}
 		if(set.castle != PlayerSettings::NONE)
 		{
-			if(!apply)
+			if(!doApply)
 			{
 				CPlayerSettingsHelper helper = CPlayerSettingsHelper(set, SelType::TOWN);
 				GH.windows().createAndPushWindow<CPlayerOptionTooltipBox>(helper);
@@ -700,7 +700,7 @@ void OptionsTab::SelectionWindow::setElement(int elem, bool apply)
 		}
 		if(set.hero != PlayerSettings::NONE)
 		{
-			if(!apply)
+			if(!doApply)
 			{
 				CPlayerSettingsHelper helper = CPlayerSettingsHelper(set, SelType::HERO);
 				GH.windows().createAndPushWindow<CPlayerOptionTooltipBox>(helper);
@@ -714,7 +714,7 @@ void OptionsTab::SelectionWindow::setElement(int elem, bool apply)
 		set.bonus = static_cast<PlayerSettings::Ebonus>(elem-1);
 		if(set.bonus != PlayerSettings::NONE)
 		{
-			if(!apply)
+			if(!doApply)
 			{
 				CPlayerSettingsHelper helper = CPlayerSettingsHelper(set, SelType::BONUS);
 				GH.windows().createAndPushWindow<CPlayerOptionTooltipBox>(helper);
@@ -722,7 +722,7 @@ void OptionsTab::SelectionWindow::setElement(int elem, bool apply)
 		}
 	}
 
-	if(apply)
+	if(doApply)
 		apply();
 }
 
diff --git a/client/lobby/OptionsTab.h b/client/lobby/OptionsTab.h
index fab3a5859..fc8f515b7 100644
--- a/client/lobby/OptionsTab.h
+++ b/client/lobby/OptionsTab.h
@@ -98,7 +98,7 @@ public:
 
 	class SelectionWindow : public CWindowObject
 	{
-		const int ICON_SMALL_WIDTH = 48;
+		//const int ICON_SMALL_WIDTH = 48;
 		const int ICON_SMALL_HEIGHT = 32;
 		const int ICON_BIG_WIDTH = 58;
 		const int ICON_BIG_HEIGHT = 64;
@@ -138,7 +138,7 @@ public:
 		void recreate();
 		void setSelection();
 		int getElement(const Point & cursorPosition);
-		void setElement(int element, bool apply);
+		void setElement(int element, bool doApply);
 
 		void clickReleased(const Point & cursorPosition) override;
 		void showPopupWindow(const Point & cursorPosition) override;