diff --git a/common/rfb/EncodeManager.cxx b/common/rfb/EncodeManager.cxx
index 64a7075..9ea5c32 100644
--- a/common/rfb/EncodeManager.cxx
+++ b/common/rfb/EncodeManager.cxx
@@ -718,10 +718,6 @@ Encoder *EncodeManager::startRect(const Rect& rect, int type, const bool trackQu
 
 void EncodeManager::endRect(const enum startRectOverride overrider)
 {
-  int klass;
-  int length;
-
-  conn->writer()->endRect();
     conn->writer()->endRect();
     const auto length = conn->getOutStream(conn->cp.supportsUdp)->length() - beforeLength;
     auto klass = activeEncoders[activeType];
@@ -937,10 +933,14 @@ void EncodeManager::updateVideoStats(const std::vector<Rect> &rects, const Pixel
     videoDetected = true;
     return;
   }
+    if (!rfb::Server::videoTime) {
+        videoDetected = true;
+        return;
+    }
 
   unsigned area = 0;
   const unsigned samples = rfb::Server::videoTime * rfb::Server::frameRate;
-  for (rect = rects.begin(); rect != rects.end(); ++rect) {
+  for (auto rect = rects.begin(); rect != rects.end(); ++rect) {
     area += rect->area();
   }
   area *= 100;
@@ -951,7 +951,7 @@ void EncodeManager::updateVideoStats(const std::vector<Rect> &rects, const Pixel
   areaCur %= samples;
 
   area = 0;
-  for (i = 0; i < samples; i++)
+  for (uint32_t i = 0; i < samples; i++)
     area += areaPercentages[i];
   area /= samples;
 
diff --git a/unix/xserver/hw/vnc/Input.c b/unix/xserver/hw/vnc/Input.c
index 62404d7..dbbfede 100644
--- a/unix/xserver/hw/vnc/Input.c
+++ b/unix/xserver/hw/vnc/Input.c
@@ -344,7 +344,7 @@ static int vncPointerProc(DeviceIntPtr pDevice, int onoff)
 		float scrollFactorH = envScrollFactorH ? atof(envScrollFactorH) : 50.0;
 		float scrollFactorV = envScrollFactorV ? atof(envScrollFactorV) : 50.0;
 
-		LOG_INFO("Mouse horizonatl scroll factor: %f", scrollFactorH);
+		LOG_INFO("Mouse horizontal scroll factor: %f", scrollFactorH);
 		LOG_INFO("Mouse vertical scroll factor: %f", scrollFactorV);
 
         SetScrollValuator(pDevice, 2, SCROLL_TYPE_HORIZONTAL, scrollFactorH, SCROLL_FLAG_NONE);