diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index da59a3b7f..ea3af35d4 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -330,10 +330,10 @@ void CComponentsHeader::initLogo()
 		//set final logo position
 		int x_logo = 0;
 		if (cch_logo.Align == CC_LOGO_RIGHT){
-			if (cch_caption_align == CTextBox::RIGHT)
+			if (cch_caption_align == CTextBox::RIGHT){
 				if (cch_text_obj)
 					x_logo = cch_text_obj->getXPos() - cch_logo_obj->getWidth();
-			else
+			}else
 				x_logo = x_logo_right;
 		}
 		if (cch_logo.Align == CC_LOGO_LEFT)
diff --git a/src/gui/lua/lua_cc_window.cpp b/src/gui/lua/lua_cc_window.cpp
index 490a48e37..6249af866 100644
--- a/src/gui/lua/lua_cc_window.cpp
+++ b/src/gui/lua/lua_cc_window.cpp
@@ -89,7 +89,7 @@ int CLuaInstCCWindow::CCWindowNew(lua_State *L)
 	tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
 	tableLookup(L, "icon", icon);
 
-	int has_shadow = CC_SHADOW_OFF;
+	lua_Integer has_shadow = CC_SHADOW_OFF;
 	if (!tableLookup(L, "has_shadow", has_shadow)) {
 		tmp1 = "false";
 		if (tableLookup(L, "has_shadow", tmp1))