diff --git a/toonz/sources/tnztools/brushtool.cpp b/toonz/sources/tnztools/brushtool.cpp
index 84599e9..3272da2 100644
--- a/toonz/sources/tnztools/brushtool.cpp
+++ b/toonz/sources/tnztools/brushtool.cpp
@@ -1688,8 +1688,6 @@ void BrushTool::draw() {
   } else {
     tglDrawCircle(m_brushPos, 0.5 * m_minThick);
     tglDrawCircle(m_brushPos, 0.5 * m_maxThick);
-    std::cout << "BRUSH m_brushPos = " << m_brushPos.x << ",  " << m_brushPos.y
-              << std::endl;
   }
 }
 
diff --git a/toonz/sources/tnztools/vectorerasertool.cpp b/toonz/sources/tnztools/vectorerasertool.cpp
index a1c8c54..18d7502 100644
--- a/toonz/sources/tnztools/vectorerasertool.cpp
+++ b/toonz/sources/tnztools/vectorerasertool.cpp
@@ -427,8 +427,6 @@ void EraserTool::draw() {
     if (m_eraseType.getValue() == NORMAL_ERASE) {
       tglColor(TPixel32(255, 0, 255));
       tglDrawCircle(m_brushPos, m_pointSize);
-      std::cout << "ERASER m_brushPos = " << m_brushPos.x << ",  "
-                << m_brushPos.y << std::endl;
     }
     if ((m_eraseType.getValue() == FREEHAND_ERASE ||
          m_eraseType.getValue() == POLYLINE_ERASE) &&
diff --git a/toonz/sources/toonz/locatorpopup.cpp b/toonz/sources/toonz/locatorpopup.cpp
index 048626e..434ca52 100644
--- a/toonz/sources/toonz/locatorpopup.cpp
+++ b/toonz/sources/toonz/locatorpopup.cpp
@@ -36,7 +36,7 @@ LocatorPopup::LocatorPopup(QWidget *parent)
 
 //-----------------------------------------------------------------------------
 
-void LocatorPopup::onChangeViewAff(const TAffine &affine, const TPointD &pos) {
+void LocatorPopup::onChangeViewAff(const TPointD &pos) {
   TAffine curAff = m_viewer->getSceneMatrix();
   TAffine newAff(curAff.a11, 0, -pos.x * curAff.a11, 0, curAff.a22,
                  -pos.y * curAff.a22);
diff --git a/toonz/sources/toonz/locatorpopup.h b/toonz/sources/toonz/locatorpopup.h
index 7745e2a..2dc3448 100644
--- a/toonz/sources/toonz/locatorpopup.h
+++ b/toonz/sources/toonz/locatorpopup.h
@@ -21,7 +21,7 @@ public:
   LocatorPopup(QWidget* parent = 0);
   SceneViewer* viewer() { return m_viewer; }
 
-  void onChangeViewAff(const TAffine& affine, const TPointD& curPos);
+  void onChangeViewAff(const TPointD& curPos);
 
 protected:
   void showEvent(QShowEvent*);
diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp
index 6873009..1b521a2 100644
--- a/toonz/sources/toonz/sceneviewer.cpp
+++ b/toonz/sources/toonz/sceneviewer.cpp
@@ -1104,7 +1104,7 @@ void SceneViewer::drawCameraStand() {
   // Show white background when level editing mode.
   TTool *tool = TApp::instance()->getCurrentTool()->getTool();
   if (m_drawEditingLevel && tool && tool->isEnabled()) {
-    tool->setViewer(this);
+    if (!m_isLocator) tool->setViewer(this);
     glPushMatrix();
     if (m_referenceMode == CAMERA3D_REFERENCE) {
       mult3DMatrix();
@@ -1366,8 +1366,8 @@ void SceneViewer::drawOverlay() {
     // draw cross at the center of the locator window
     if (m_isLocator) {
       glColor3d(1.0, 0.0, 0.0);
-      tglDrawSegment(TPointD(-5, 0), TPointD(5, 0));
-      tglDrawSegment(TPointD(0, -5), TPointD(0, 5));
+      tglDrawSegment(TPointD(-4, 0), TPointD(5, 0));
+      tglDrawSegment(TPointD(0, -4), TPointD(0, 5));
     }
   }
 }
diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp
index 8ca0585..d07163f 100644
--- a/toonz/sources/toonz/sceneviewerevents.cpp
+++ b/toonz/sources/toonz/sceneviewerevents.cpp
@@ -356,10 +356,11 @@ void SceneViewer::mouseMoveEvent(QMouseEvent *event) {
     TMouseEvent toonzEvent;
     initToonzEvent(toonzEvent, event, height(), m_pressure, m_tabletEvent,
                    false);
-    TPointD pos = tool->getMatrix().inv() * winToWorld(curPos);
+    TPointD worldPos = winToWorld(curPos);
+    TPointD pos      = tool->getMatrix().inv() * worldPos;
 
     if (m_locator) {
-      m_locator->onChangeViewAff(m_viewAff[m_viewMode], pos);
+      m_locator->onChangeViewAff(worldPos);
     }
 
     TObjectHandle *objHandle = TApp::instance()->getCurrentObject();