diff --git a/source/gui/CList.cpp b/source/gui/CList.cpp
index 2c4e8f7af4..a2e0957e73 100644
--- a/source/gui/CList.cpp
+++ b/source/gui/CList.cpp
@@ -86,7 +86,7 @@ void CList::SetupText()
 	// Generate texts
 	float buffered_y = 0.f;
 
-	for (int i=0; i<m_Items.size(); ++i)
+	for (size_t i=0; i<m_Items.size(); ++i)
 	{
 		// Create a new SGUIText. Later on, input it using AddText()
 		SGUIText *text = new SGUIText();
@@ -167,7 +167,7 @@ void CList::HandleMessage(const SGUIMessage &Message)
 		CPos mouse = GetMousePos();
 		mouse.y += scroll;
 		int set=-1;
-		for (int i=0; i<m_Items.size(); ++i)
+		for (int i=0; i<(int)m_Items.size(); ++i)
 		{
 			if (mouse.y >= m_CachedActualSize.top + m_ItemsYPositions[i] &&
 				mouse.y < m_CachedActualSize.top + m_ItemsYPositions[i+1] &&
@@ -328,7 +328,7 @@ void CList::Draw()
 		CColor color;
 		GUI<CColor>::GetSetting(this, "textcolor", color);
 
-		for (int i=0; i<m_Items.size(); ++i)
+		for (int i=0; i<(int)m_Items.size(); ++i)
 		{
 			if (m_ItemsYPositions[i+1] - scroll < 0 ||
 				m_ItemsYPositions[i] - scroll > m_CachedActualSize.GetHeight())
@@ -404,7 +404,7 @@ void CList::SelectLastElement()
 
 	if (selected != m_Items.size()-1)
 	{
-		GUI<int>::SetSetting(this, "selected", m_Items.size()-1);
+		GUI<int>::SetSetting(this, "selected", (int)m_Items.size()-1);
 	}
 }
 
diff --git a/source/simulation/BaseEntity.cpp b/source/simulation/BaseEntity.cpp
index 2366c51231..05297a53ca 100755
--- a/source/simulation/BaseEntity.cpp
+++ b/source/simulation/BaseEntity.cpp
@@ -173,7 +173,8 @@ bool CBaseEntity::loadXML( CStr filename )
 					if( ExternalFunction != CStrW() )
 					{
 						jsval fnval;
-						assert( JS_TRUE == JS_GetUCProperty( g_ScriptingHost.GetContext(), g_ScriptingHost.GetGlobalObject(), ExternalFunction.c_str(), ExternalFunction.Length(), &fnval ) );
+						JSBool ret = JS_GetUCProperty( g_ScriptingHost.GetContext(), g_ScriptingHost.GetGlobalObject(), ExternalFunction.c_str(), ExternalFunction.Length(), &fnval );
+						assert( ret );
 						JSFunction* fn = JS_ValueToFunction( g_ScriptingHost.GetContext(), fnval );
 						if( !fn )
 						{