diff --git a/src/controllers/DockWidget.h b/src/controllers/DockWidget.h
index 84b0c958..488880f1 100644
--- a/src/controllers/DockWidget.h
+++ b/src/controllers/DockWidget.h
@@ -510,7 +510,7 @@ Q_SIGNALS:
     /// @brief Emitted when this dock widget is about to be deleted due to Option_DeleteOnClose
     void aboutToDeleteOnClose();
 
-public: // TODOm2 make private
+public: // TODOm3 make private
     void onParentChanged();
     void onShown(bool spontaneous);
     void onHidden(bool spontaneous);
diff --git a/src/controllers/FloatingWindow.h b/src/controllers/FloatingWindow.h
index 1c569a2c..51afa4be 100644
--- a/src/controllers/FloatingWindow.h
+++ b/src/controllers/FloatingWindow.h
@@ -211,7 +211,6 @@ public:
     /// be open ended
     static Qt::WindowFlags s_windowFlagsOverride;
 
-    void updateSizeConstraints(); // TODOm2: Move private
     void maybeCreateResizeHandler();
 
 Q_SIGNALS:
@@ -229,6 +228,7 @@ private:
     void onFrameCountChanged(int count);
     void onVisibleFrameCountChanged(int count);
     void onCloseEvent(QCloseEvent *);
+    void updateSizeConstraints();
     bool m_disableSetVisible = false;
     bool m_deleteScheduled = false;
     bool m_inDtor = false;
diff --git a/src/private/DragController.cpp b/src/private/DragController.cpp
index 3fd4677b..6a1bc16c 100644
--- a/src/private/DragController.cpp
+++ b/src/private/DragController.cpp
@@ -386,7 +386,7 @@ bool StateDragging::handleMouseMove(QPoint globalPos)
     }
 
     if (!q->m_nonClientDrag)
-        fw->view()->window()->setPosition(globalPos - q->m_offset);
+        fw->view()->window()->setFramePosition(globalPos - q->m_offset);
 
     if (fw->anyNonDockable()) {
         qCDebug(state) << "StateDragging: Ignoring non dockable floating window";
diff --git a/src/qtcommon/Window_qt.cpp b/src/qtcommon/Window_qt.cpp
index 07d3c1d7..2f68df91 100644
--- a/src/qtcommon/Window_qt.cpp
+++ b/src/qtcommon/Window_qt.cpp
@@ -83,10 +83,9 @@ void Window_qt::setFramePosition(QPoint targetPos)
     m_window->setFramePosition(targetPos);
 }
 
-// TODOm2: this is setting the frame position ?
 void Window_qt::setPosition(QPoint targetPos)
 {
-    m_window->setFramePosition(targetPos);
+    m_window->setPosition(targetPos);
 }
 
 QRect Window_qt::frameGeometry() const
diff --git a/tests/qtquick/tst_qtquick.cpp b/tests/qtquick/tst_qtquick.cpp
index a6590e5f..c7274fa2 100644
--- a/tests/qtquick/tst_qtquick.cpp
+++ b/tests/qtquick/tst_qtquick.cpp
@@ -91,7 +91,7 @@ void TestQtQuick::tst_hoverShowsDropIndicators()
     QCOMPARE(mainWindows.size(), 1);
     MainWindow *m = mainWindows.first();
 
-    m->window()->window()->setPosition(QPoint(500, 800));
+    m->window()->window()->setFramePosition(QPoint(500, 800));
 
     auto dock0 = createDockWidget("dock0", Platform::instance()->tests_createView({ true, {}, QSize(400, 400) }));