diff --git a/aegisub/auto4_perl.cpp b/aegisub/auto4_perl.cpp
index a5296a57a..918b1318b 100644
--- a/aegisub/auto4_perl.cpp
+++ b/aegisub/auto4_perl.cpp
@@ -266,8 +266,8 @@ namespace Automation4 {
   XS(perl_console_register)
   {
 	wxTRACE_FUNC(Aegisub::PerlConsole::register_console);
-#ifdef WITH_PERLCONSOLE
 	dXSARGS;
+#ifdef WITH_PERLCONSOLE
 
 	PerlScript *script = PerlScript::GetScript();
 	if(script) {
diff --git a/aegisub/changelog.txt b/aegisub/changelog.txt
index 9944b735c..dea5dc8b5 100644
--- a/aegisub/changelog.txt
+++ b/aegisub/changelog.txt
@@ -1,7 +1,7 @@
 Aegisub changelog
 Please visit http://aegisub.net to download latest version
 
-= 2.00 - 2008.xx.xx ===========================
+= 2.2.0 - 2008.xx.xx ===========================
 
 - New Aegisub logo. (amz)
 - The Automation 4 system has been introduced. This means lots of changes. (jfs)
diff --git a/assdraw/assdraw.vcproj b/assdraw/assdraw.vcproj
index 6e99d3500..d06959f8d 100644
--- a/assdraw/assdraw.vcproj
+++ b/assdraw/assdraw.vcproj
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\assdraw3_d.exe"
+				OutputFile="../bin/assdraw3_d.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -214,7 +214,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\assdraw3.exe"
+				OutputFile="../bin/assdraw3.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
diff --git a/assdraw/src/cmd.cpp b/assdraw/src/cmd.cpp
index 4d0aa88c9..76432a9cb 100644
--- a/assdraw/src/cmd.cpp
+++ b/assdraw/src/cmd.cpp
@@ -125,11 +125,12 @@ void DrawCmd_B::Init ( unsigned n )
 // to ASS drawing command
 wxString DrawCmd_B::ToString()
 {
-	PointList::iterator iterate = controlpoints.begin();
-	Point* c1 = (*iterate++);
-	Point* c2 = (*iterate);
-	if (initialized)
+	if (initialized) {
+		PointList::iterator iterate = controlpoints.begin();
+		Point* c1 = (*iterate++);
+		Point* c2 = (*iterate);
 		return wxString::Format(_T("b %d %d %d %d %d %d"), c1->x(), c1->y(), c2->x(), c2->y(), m_point->x(), m_point->y());
+	}
 	else
 		return wxString::Format(_T("b ? ? ? ? %d %d"), m_point->x(), m_point->y());
 }
diff --git a/installer/aegisub2.iss b/installer/aegisub2.iss
index 0850e383b..e3dd9da3a 100644
--- a/installer/aegisub2.iss
+++ b/installer/aegisub2.iss
@@ -33,7 +33,7 @@
 ;
 
 #define MyAppName "Aegisub"
-#define MyAppRevision "r1840"
+#define MyAppRevision "r1847"
 #define MyAppVer "2.1.0 Release Preview"
 #define MyAppPublisher "Aegisub Team"
 #define MyAppURL "http://aegisub.net/"
diff --git a/installer/latest.txt b/installer/latest.txt
index 18780fd8e..651a466d9 100644
--- a/installer/latest.txt
+++ b/installer/latest.txt
@@ -1,3 +1,3 @@
 release;1.10-524;http://www.aegisub.net/;Aegisub 1.10
 
-svn;1813;http://www.malakith.net/amz/aegisub/;Aegisub Pre-Release 2.00 r1813 build - Guess what? Bug fixes!
\ No newline at end of file
+svn;1847;http://www.malakith.net/amz/aegisub/;Aegisub 2.1.0 Release Preview r1847 build - Core executable considered stable unless someone finds any issues. Marked "Release Preview" due to incomplete documentation, scripts, and translations.
\ No newline at end of file