diff --git a/gtk2_ardour/canvas-note.h b/gtk2_ardour/canvas-note.h
index de2d0ecb9d..84791c89ca 100644
--- a/gtk2_ardour/canvas-note.h
+++ b/gtk2_ardour/canvas-note.h
@@ -31,15 +31,6 @@ namespace Canvas {
 
 class CanvasNote : public SimpleRect, public CanvasNoteEvent {
 public:
-	CanvasNote(
-			MidiRegionView&                       region,
-			Group&                                group,
-			const boost::shared_ptr<ARDOUR::Note> note = boost::shared_ptr<ARDOUR::Note>())
-
-		: SimpleRect(group), CanvasNoteEvent(region, this, note)
-	{
-	}
-
 	double x1() { return property_x1(); }
 	double y1() { return property_y1(); }
 	double x2() { return property_x2(); }
@@ -61,6 +52,15 @@ public:
 		AbsoluteResize
 	};
 
+	CanvasNote(
+			MidiRegionView&                       region,
+			Group&                                group,
+			const boost::shared_ptr<ARDOUR::Note> note = boost::shared_ptr<ARDOUR::Note>())
+
+		: SimpleRect(group), CanvasNoteEvent(region, this, note), _note_state(None)
+	{
+	}
+
 protected:
 	NoteState _note_state;
 
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index 4990ede978..f17324e8c6 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -260,7 +260,8 @@ MidiModel::const_iterator& MidiModel::const_iterator::operator=(const const_iter
 	_locked = other._locked;
 	_note_iter = other._note_iter;
 	_control_iters = other._control_iters;
-	_control_iter = other._control_iter;
+	size_t index = other._control_iter - other._control_iters.begin();
+	_control_iter = _control_iters.begin() + index;
 
 	assert( ! _event.owns_buffer());