--- a/ds/utils/xmlparser.cpp
+++ b/ds/utils/xmlparser.cpp
@@ -114,8 +114,6 @@
 {
 	static char* fn = "[XMLParser::Parse]";
 
-	fprintf(stderr, "XMLDBG: length=%ld data='%.30s'\n", length, pData ? pData : "(null)"); fflush(stderr);
-
 	// Split data into m_lines
 	string temp;
 	for(int i = 0; i < (int)length; i++)
@@ -124,8 +122,8 @@
 		if(pData[i] == '\n')
 		{
 			// Fix the "\n" linebreaks
-			unsigned int lbegin = 0;
-			unsigned int lend = 0;
+			size_t lbegin = 0;
+			size_t lend = 0;
 			string out;
 			for(;;)
 			{
@@ -148,10 +146,9 @@
 		}
 	}
 
-	fprintf(stderr, "XMLDBG: %zu lines split\n", m_lines.size()); fflush(stderr);
 	// Look for XML header
 	m_currentline = 0;
-	unsigned int loc = m_lines[m_currentline].find("<?");
+	size_t loc = m_lines[m_currentline].find("<?");
 	if(loc == string::npos)
 		throw Exception(fn, "No XML header.");
 
@@ -167,12 +164,12 @@
 	XMLElement* pElement = new XMLElement(m_currentline+1);
 
 	// Look for begin tag
-	unsigned int l0 = m_lines[m_currentline].find("<");
+	size_t l0 = m_lines[m_currentline].find("<");
 	if(l0 == string::npos)
 		throw Exception(fn, "\"<\" expected at line " + itoa(m_currentline+1) + ".");
 
 	// Look for element value
-	unsigned int l1 = m_lines[m_currentline].find_first_of(" ", l0);
+	size_t l1 = m_lines[m_currentline].find_first_of(" ", l0);
 	if(l1 == string::npos)
 		throw Exception(fn, "space expected after element value at line " + itoa(m_currentline+1) + ".");
 
@@ -241,11 +238,9 @@
 	bool bHasText = false;
 	bool bComment = false;
 	int CommentStart = 0;
-	int iterations = 0;
 	while(!bHasText)
 	{
 		m_currentline++;
-		if(++iterations > 100000) { fprintf(stderr, "XMLDBG: FindNextLine infinite loop at line %d\n", m_currentline); fflush(stderr); }
 
 		if(m_currentline == (int)m_lines.size()) {
 			if(bComment)
--- a/ds/scriptparser.cpp
+++ b/ds/scriptparser.cpp
@@ -204,7 +204,7 @@
 	{
 		// Translate binds
 		string current = bindindex[i];
-		unsigned int loc = str.find(current);
+		size_t loc = str.find(current);
 		if(loc != string::npos)
 		{
 			str = str.substr(0, loc) + pBindMap->Get(current.c_str()) +