diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 1a03f66f24..81ca998a00 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -4001,8 +4001,11 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 			continue;
 		}
 		
+		changed_position = (drag_info.last_frame_position != (nframes_t) (rv->region()->position()));
+		changed_tracks = (dest_tv != &rv->get_time_axis_view());
+
 		if (changed_position && !drag_info.x_constrained) {
-			where = rv->region()->position() - drag_delta;
+			where = (nframes_t) unit_to_frame (ix1);
 		} else {
 			where = rv->region()->position();
 		}
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index f463d914f0..048d8c2725 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -728,6 +728,7 @@ Editor::update_ruler_visibility ()
 		range_marker_bar_group->show();
 		range_marker_group->show();
 		range_mark_label.show();
+
 		tbpos += timebar_height;
 		tbgpos += timebar_height;
 		visible_timebars++;
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 42be403bf9..1887c6d7ea 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -560,7 +560,6 @@ TimeAxisView::conditionally_add_to_selection ()
 	}
 }
 
-
 void
 TimeAxisView::popup_display_menu (guint32 when)
 {