diff --git a/aegilib/src/formats/format_ass.cpp b/aegilib/src/formats/format_ass.cpp
index 604b639ab..cecd766b8 100644
--- a/aegilib/src/formats/format_ass.cpp
+++ b/aegilib/src/formats/format_ass.cpp
@@ -343,7 +343,7 @@ void FormatHandlerASS::WriteSection(TextFileWriter &writer,SectionPtr section)
 	size_t props = section->GetPropertyCount();
 	for (size_t i=0;i<props;i++) {
 		String propName = section->GetPropertyName(i);
-		writer.WriteLineToFile(propName + _T(": ") + section->GetProperty(name));
+		writer.WriteLineToFile(propName + _T(": ") + section->GetProperty(propName));
 	}
 
 	// Write contents
diff --git a/aegisub/gl_wrap.cpp b/aegisub/gl_wrap.cpp
index 7c3e36b37..ba52eea3d 100644
--- a/aegisub/gl_wrap.cpp
+++ b/aegisub/gl_wrap.cpp
@@ -100,7 +100,7 @@ void OpenGLWrapper::DrawLine(float x1,float y1,float x2,float y2) {
 // Draw line
 void OpenGLWrapper::DrawDashedLine(float x1,float y1,float x2,float y2,float step) {
 	float dist = sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1));
-	int steps = (dist-20)/step;
+	int steps = (int)((dist-20)/step);
 	double stepx = double(x2-x1)/steps;
 	double stepy = double(y2-y1)/steps;
 	for (int i=0;i<steps;i++) {
diff --git a/aegisub/spline.cpp b/aegisub/spline.cpp
index d5c26d7b2..585f76200 100644
--- a/aegisub/spline.cpp
+++ b/aegisub/spline.cpp
@@ -128,8 +128,8 @@ void Spline::DecodeFromASS(wxString str) {
 				curve.p2.x = stack[0];
 				curve.p2.y = stack[1];
 				curve.type = CURVE_LINE;
-				x = curve.p2.x;
-				y = curve.p2.y;
+				x = (int)curve.p2.x;
+				y = (int)curve.p2.y;
 				stack.clear();
 				AppendCurve(curve);
 			}
@@ -146,8 +146,8 @@ void Spline::DecodeFromASS(wxString str) {
 				curve.p4.x = stack[4];
 				curve.p4.y = stack[5];
 				curve.type = CURVE_BICUBIC;
-				x = curve.p4.x;
-				y = curve.p4.y;
+				x = (int)curve.p4.x;
+				y = (int)curve.p4.y;
 				stack.clear();
 				AppendCurve(curve);
 			}
@@ -300,7 +300,7 @@ void Spline::GetPointList(std::vector<Vector2D> &points,std::vector<int> &pointC
 			Vector2D p4 = cur->p4;
 
 			// Find number of steps
-			int len = (p2-p1).Len() + (p3-p2).Len() + (p4-p3).Len();
+			int len = (int)((p2-p1).Len() + (p3-p2).Len() + (p4-p3).Len());
 			int steps = len/8;
 
 			// Render curve
diff --git a/build/aegisub_vs2005/aegisub_vs2005.vcproj b/build/aegisub_vs2005/aegisub_vs2005.vcproj
index a4ee4ee39..296902fa4 100644
--- a/build/aegisub_vs2005/aegisub_vs2005.vcproj
+++ b/build/aegisub_vs2005/aegisub_vs2005.vcproj
@@ -744,62 +744,6 @@
 				</File>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="Wrappers"
-			>
-			<File
-				RelativePath="..\..\aegisub\avisynth.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\avisynth_wrap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\avisynth_wrap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\gl_text.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\gl_text.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\gl_wrap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\gl_wrap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\lavc_file.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\lavc_file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\mkv_wrap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\mkv_wrap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\vfw_wrap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\aegisub\vfw_wrap.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Controls"
 			>
@@ -1203,6 +1147,62 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="Wrappers"
+				>
+				<File
+					RelativePath="..\..\aegisub\avisynth.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\avisynth_wrap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\avisynth_wrap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\gl_text.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\gl_text.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\gl_wrap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\gl_wrap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\lavc_file.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\lavc_file.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\mkv_wrap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\mkv_wrap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\vfw_wrap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\aegisub\vfw_wrap.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Dialogs"