diff --git a/toonz/sources/common/tapptools/tenv.cpp b/toonz/sources/common/tapptools/tenv.cpp
index 13de2a2..173c349 100644
--- a/toonz/sources/common/tapptools/tenv.cpp
+++ b/toonz/sources/common/tapptools/tenv.cpp
@@ -172,9 +172,9 @@ public:
     m_applicationFullName = m_version.getAppName() + " " + m_applicationVersion;
     if (m_version.hasAppNote())
       m_applicationFullName += " " + m_version.getAppNote();
-      
-    m_moduleName          = m_version.getAppName();
-    m_rootVarName         = toUpper(m_version.getAppName()) + "ROOT";
+
+    m_moduleName  = m_version.getAppName();
+    m_rootVarName = toUpper(m_version.getAppName()) + "ROOT";
 #ifdef _WIN32
     // from v1.3, registry root is moved to SOFTWARE\\OpenToonz\\OpenToonz
     m_registryRoot =
@@ -694,8 +694,7 @@ std::string toString2(T value) {
 template <>
 std::string toString2(TRect value) {
   std::ostringstream ss;
-  ss << value.x0 << " " << value.y0 << " " << value.x1 << " " << value.y1
-     << '\0';
+  ss << value.x0 << " " << value.y0 << " " << value.x1 << " " << value.y1;
   return ss.str();
 }
 
diff --git a/toonz/sources/toonz/penciltestpopup.cpp b/toonz/sources/toonz/penciltestpopup.cpp
index f288f81..94df853 100644
--- a/toonz/sources/toonz/penciltestpopup.cpp
+++ b/toonz/sources/toonz/penciltestpopup.cpp
@@ -646,9 +646,9 @@ void MyVideoWidget::mouseMoveEvent(QMouseEvent* event) {
 
     if (m_activeSubHandle == HandleFrame) {
       clampPoint(offset, -m_preSubCameraRect.left(),
-                 camSize.width() - m_preSubCameraRect.right(),
+                 camSize.width() - m_preSubCameraRect.right() - 1,
                  -m_preSubCameraRect.top(),
-                 camSize.height() - m_preSubCameraRect.bottom());
+                 camSize.height() - m_preSubCameraRect.bottom() - 1);
       m_subCameraRect = m_preSubCameraRect.translated(offset);
     } else {
       if (m_activeSubHandle == HandleTopLeft ||
@@ -661,7 +661,7 @@ void MyVideoWidget::mouseMoveEvent(QMouseEvent* event) {
                  m_activeSubHandle == HandleBottomRight ||
                  m_activeSubHandle == HandleRight) {
         clampVal(offset.rx(), -m_preSubCameraRect.width() + minimumSize,
-                 camSize.width() - m_preSubCameraRect.right());
+                 camSize.width() - m_preSubCameraRect.right() - 1);
         m_subCameraRect.setRight(m_preSubCameraRect.right() + offset.x());
       }
 
@@ -675,7 +675,7 @@ void MyVideoWidget::mouseMoveEvent(QMouseEvent* event) {
                  m_activeSubHandle == HandleBottomLeft ||
                  m_activeSubHandle == HandleBottom) {
         clampVal(offset.ry(), -m_preSubCameraRect.height() + minimumSize,
-                 camSize.height() - m_preSubCameraRect.bottom());
+                 camSize.height() - m_preSubCameraRect.bottom() - 1);
         m_subCameraRect.setBottom(m_preSubCameraRect.bottom() + offset.y());
       }
     }
@@ -1299,7 +1299,7 @@ bool strToSubCamera(const QString& str, QRect& subCamera, double& dpi) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
   QStringList values = str.split(',', Qt::SkipEmptyParts);
 #else
-  QStringList values = str.split(',', QString::SkipEmptyParts);
+  QStringList values         = str.split(',', QString::SkipEmptyParts);
 #endif
   if (values.count() != 4 && values.count() != 5) return false;
   subCamera = QRect(values[0].toInt(), values[1].toInt(), values[2].toInt(),