diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp
index a1e18bb09b..926dd99e7b 100644
--- a/source/gui/CInput.cpp
+++ b/source/gui/CInput.cpp
@@ -951,9 +951,9 @@ void CInput::Draw()
 					if (i != (int)it->m_ListOfX.size() &&
 						it->m_ListStart + i == m_iBufferPos)
 					{
-						// selecting only one, then we need only to draw a vertical line glyph.
+						// selecting only one, then we need only to draw a cursor.
 						glPushMatrix();
-						glwprintf(L"%lc", 0xFE33);
+						glwprintf(L"_");
 						glPopMatrix();
 					}
 
@@ -981,7 +981,7 @@ void CInput::Draw()
 				if (it->m_ListStart + (int)it->m_ListOfX.size() == m_iBufferPos)
 				{
 					glColor4f(color.r, color.g, color.b, color.a);
-					glwprintf(L"%lc", 0xFE33);
+					glwprintf(L"_");
 
 					if (using_selected_color)
 					{
diff --git a/source/lib/res/graphics/unifont.cpp b/source/lib/res/graphics/unifont.cpp
index 11efd4d216..c2396b3f7a 100644
--- a/source/lib/res/graphics/unifont.cpp
+++ b/source/lib/res/graphics/unifont.cpp
@@ -246,8 +246,10 @@ void glvwprintf(const wchar_t* fmt, va_list args)
 	const int buf_size = 1024;
 	wchar_t buf[buf_size];
 
-	if(vswprintf(buf, buf_size-1, fmt, args) < 0)
-		debug_printf("glwprintf failed (buffer size exceeded?)\n");
+	int ret = vswprintf(buf, buf_size-1, fmt, args);
+	if(ret < 0) {
+		debug_printf("glwprintf failed (buffer size exceeded?) - return value %d, errno %d\n", ret, errno);
+	}
 
 	// Make sure there's always null termination
 	buf[buf_size-1] = 0;
diff --git a/source/network/Network.cpp b/source/network/Network.cpp
index d028acfa2a..2ddede5cb2 100644
--- a/source/network/Network.cpp
+++ b/source/network/Network.cpp
@@ -242,7 +242,6 @@ void CMessageSocket::StartReadHeader()
 			m_pRdBuffer=(u8 *)malloc(m_RdBufferSize);
 	}
 	m_ReadingData=false;
-	printf("CMessageSocket::StartReadHeader(): Trying to read %u\n", HEADER_LENGTH);
 	PS_RESULT res=Read(m_pRdBuffer, HEADER_LENGTH);
 	if (res != PS_OK)
 	{
diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp
index 7dcc31f6aa..0b4bb19686 100644
--- a/source/ps/CConsole.cpp
+++ b/source/ps/CConsole.cpp
@@ -322,9 +322,8 @@ void CConsole::DrawCursor(void)
 		// Slightly translucent yellow
 		glColor4f(1.0f, 1.0f, 0.0f, 0.8f);
 
-		// U+FE33: PRESENTATION FORM FOR VERTICAL LOW LINE
-		// (sort of like a | which is aligned to the left of most characters)
-		glwprintf(L"%lc", 0xFE33);
+		// Cursor character is chosen to be an underscore
+		glwprintf(L"_");
 
 		// Revert to the standard text colour
 		glColor3f(1.0f, 1.0f, 1.0f);