diff --git a/src/editortoolkit_neume.cpp b/src/editortoolkit_neume.cpp
index 4d4bddc2ca..be98986366 100644
--- a/src/editortoolkit_neume.cpp
+++ b/src/editortoolkit_neume.cpp
@@ -4215,6 +4215,7 @@ bool EditorToolkitNeume::AdjustPitchFromPosition(Object *obj)
                 return false;
             }
             clef = layer->GetCurrentClef();
+            clefOffset = round((double)(staff->m_drawingLines - clef->GetLine()) * staffSize);
         }
         else {
             Staff *clefStaff = dynamic_cast<Staff *>(clef->GetFirstAncestor(STAFF));
diff --git a/src/facsimilefunctor.cpp b/src/facsimilefunctor.cpp
index 0803cb2830..bd1ee9017e 100644
--- a/src/facsimilefunctor.cpp
+++ b/src/facsimilefunctor.cpp
@@ -184,7 +184,10 @@ FunctorCode SyncFromFacsimileFunctor::VisitStaff(Staff *staff)
         m_staffZones[staff] = zone;
 
         // The staff slope is going up. The y left position needs to be adjusted accordingly
-        if (zone->HasRotate() && zone->GetRotate() < 0) {
+        if (!zone->HasRotate()) {
+            zone->SetRotate(0);
+        }
+        else {
             staff->m_drawingFacsY = staff->m_drawingFacsY
                 + (m_currentNeumeLine->m_drawingFacsX2 - m_currentNeumeLine->m_drawingFacsX1)
                     * tan(zone->GetRotate() * M_PI / 180.0);
@@ -326,6 +329,7 @@ FunctorCode SyncToFacsimileFunctor::VisitSb(Sb *sb)
 
 FunctorCode SyncToFacsimileFunctor::VisitStaff(Staff *staff)
 {
+    LogError("SyncToFacsimileFunctor::VisitStaff");
     Zone *zone = this->GetZone(staff, staff->GetClassName());
     zone->SetUly(m_view.ToDeviceContextY(staff->GetDrawingY()) / DEFINITION_FACTOR + m_pageMarginTop);