diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index dae35744eb..c832eb72c3 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -216,7 +216,7 @@ void BitmapText::SetText( CString sText, bool DoSubst )
 	m_iLineWidths.clear();
 	m_iLineHeights.clear();
 
-	lstring s; s.push_back('\n');
+	lstring s; s+='\n';
 	split(CStringToLstring(sText), s, m_szTextLines, false);
 	
 	/* calculate line lengths and widths */
diff --git a/stepmania/src/Font.cpp b/stepmania/src/Font.cpp
index 58475ed927..0676f9033c 100644
--- a/stepmania/src/Font.cpp
+++ b/stepmania/src/Font.cpp
@@ -209,11 +209,13 @@ Font::Font()
 
 Font::~Font()
 {
-	for(unsigned i = 0; i < pages.size(); ++i)
+	unsigned i;
+
+	for(i = 0; i < pages.size(); ++i)
 		delete pages[i];
 
 	/* Free any fonts that we merged into us. */
-	for(unsigned i = 0; i < merged_fonts.size(); ++i)
+	for(i = 0; i < merged_fonts.size(); ++i)
 		FONT->UnloadFont(merged_fonts[i]);
 }
 
diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index 42a21cb05d..6685716785 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -915,9 +915,9 @@ lstring CStringToLstring(const CString &str)
 	{
 		longchar c = utf8_get_char (ptr);
 		if(c == -1)
-			ret.push_back(INVALID_CHAR);
+			ret += INVALID_CHAR;
 		else
-			ret.push_back(c);
+			ret += c;
 		ptr = utf8_find_next_char (ptr, end);
 	}
 
diff --git a/stepmania/src/plib-1.6.0/sg_d.lib b/stepmania/src/plib-1.6.0/sg_d.lib
index c19e2cb801..4cb309f3c1 100644
Binary files a/stepmania/src/plib-1.6.0/sg_d.lib and b/stepmania/src/plib-1.6.0/sg_d.lib differ
diff --git a/stepmania/src/plib-1.6.0/src/util/Debug/vc60.pdb b/stepmania/src/plib-1.6.0/src/util/Debug/vc60.pdb
index a6788c4c96..7a180eea7f 100644
Binary files a/stepmania/src/plib-1.6.0/src/util/Debug/vc60.pdb and b/stepmania/src/plib-1.6.0/src/util/Debug/vc60.pdb differ
diff --git a/stepmania/src/plib-1.6.0/ul_d.lib b/stepmania/src/plib-1.6.0/ul_d.lib
index 4c6221ac08..90ef885385 100644
Binary files a/stepmania/src/plib-1.6.0/ul_d.lib and b/stepmania/src/plib-1.6.0/ul_d.lib differ