diff --git a/aegisub/video_context.cpp b/aegisub/video_context.cpp
index 0233cfd15..3f9fa4f24 100644
--- a/aegisub/video_context.cpp
+++ b/aegisub/video_context.cpp
@@ -390,8 +390,9 @@ void VideoContext::Refresh (bool video, bool subtitles) {
 	// Reset frame
 	lastFrame = -1;
 
-	// Get provider
+	// Update subtitles
 	if (subtitles && subsProvider) {
+		// Re-export
 		AssExporter exporter(grid->ass);
 		exporter.AddAutoFilters();
 		subsProvider->LoadSubtitles(exporter.ExportTransform());
@@ -412,7 +413,7 @@ void VideoContext::JumpToFrame(int n) {
 	if (isPlaying && n != playNextFrame) return;
 
 	// Threaded
-	if (threaded) {	// Doesn't work, so it's disabled
+	if (threaded && false) {	// Doesn't work, so it's disabled
 		wxMutexLocker lock(vidMutex);
 		threadNextFrame = n;
 		if (!threadLocked) {
diff --git a/aegisub/visual_tool_rotatexy.cpp b/aegisub/visual_tool_rotatexy.cpp
index e0511564d..ef5c7c17b 100644
--- a/aegisub/visual_tool_rotatexy.cpp
+++ b/aegisub/visual_tool_rotatexy.cpp
@@ -53,9 +53,7 @@ VisualToolRotateXY::VisualToolRotateXY(VideoDisplay *_parent)
 : VisualTool(_parent)
 {
 	_parent->ShowCursor(false);
-	AssDialogue *line = GetActiveDialogueLine();
-	GetLinePosition(line,odx,ody,orgx,orgy);
-	GetLineRotation(line,curAngleX,curAngleY,rz);
+	DoRefresh();
 }
 
 
@@ -264,3 +262,12 @@ void VisualToolRotateXY::UpdateDrag(VisualDraggableFeature &feature) {
 void VisualToolRotateXY::CommitDrag(VisualDraggableFeature &feature) {
 	SetOverride(_T("\\org"),wxString::Format(_T("(%i,%i)"),feature.x,feature.y));
 }
+
+
+///////////
+// Refresh
+void VisualToolRotateXY::DoRefresh() {
+	AssDialogue *line = GetActiveDialogueLine();
+	GetLinePosition(line,odx,ody,orgx,orgy);
+	GetLineRotation(line,curAngleX,curAngleY,rz);
+}
diff --git a/aegisub/visual_tool_rotatexy.h b/aegisub/visual_tool_rotatexy.h
index 685403807..1adcbb14e 100644
--- a/aegisub/visual_tool_rotatexy.h
+++ b/aegisub/visual_tool_rotatexy.h
@@ -61,6 +61,8 @@ private:
 	void UpdateDrag(VisualDraggableFeature &feature);
 	void CommitDrag(VisualDraggableFeature &feature);
 
+	void DoRefresh();
+
 public:
 	VisualToolRotateXY(VideoDisplay *parent);
 
diff --git a/aegisub/visual_tool_rotatez.cpp b/aegisub/visual_tool_rotatez.cpp
index 7805d1122..dd3b91157 100644
--- a/aegisub/visual_tool_rotatez.cpp
+++ b/aegisub/visual_tool_rotatez.cpp
@@ -53,9 +53,7 @@ VisualToolRotateZ::VisualToolRotateZ(VideoDisplay *_parent)
 : VisualTool(_parent)
 {
 	_parent->ShowCursor(false);
-	AssDialogue *line = GetActiveDialogueLine();
-	GetLinePosition(line,odx,ody,orgx,orgy);
-	GetLineRotation(line,rx,ry,curAngle);
+	DoRefresh();
 }
 
 
@@ -230,3 +228,12 @@ void VisualToolRotateZ::UpdateDrag(VisualDraggableFeature &feature) {
 void VisualToolRotateZ::CommitDrag(VisualDraggableFeature &feature) {
 	SetOverride(_T("\\org"),wxString::Format(_T("(%i,%i)"),feature.x,feature.y));
 }
+
+
+///////////
+// Refresh
+void VisualToolRotateZ::DoRefresh() {
+	AssDialogue *line = GetActiveDialogueLine();
+	GetLinePosition(line,odx,ody,orgx,orgy);
+	GetLineRotation(line,rx,ry,curAngle);
+}
diff --git a/aegisub/visual_tool_rotatez.h b/aegisub/visual_tool_rotatez.h
index 45bdb3b02..123e6a954 100644
--- a/aegisub/visual_tool_rotatez.h
+++ b/aegisub/visual_tool_rotatez.h
@@ -60,6 +60,8 @@ private:
 	void UpdateDrag(VisualDraggableFeature &feature);
 	void CommitDrag(VisualDraggableFeature &feature);
 
+	void DoRefresh();
+
 public:
 	VisualToolRotateZ(VideoDisplay *parent);