diff --git a/class2.php b/class2.php
index 1093b9ba9..e3e153a1d 100755
--- a/class2.php
+++ b/class2.php
@@ -510,7 +510,7 @@ if(!e107::getConfig()->hasData())
 //DEPRECATED, BC, call e107::getPref/findPref() instead
 $pref = e107::getPref();
 
-if(!empty($pref['thumb_to_webp']))
+if(e_ADMIN_AREA !== true && !empty($pref['thumb_to_webp']))
 {
 	$tp->setConvertToWebP(true);
 }
diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php
index 086d64432..2d7fd37e3 100644
--- a/e107_handlers/db_debug_class.php
+++ b/e107_handlers/db_debug_class.php
@@ -136,6 +136,11 @@
             $this->logTime($sMarker);
         }
 
+		/**
+		 * Replacement for $sql->db_Mark_Time()
+		 * @param string $sMarker - a descriptive marker for the log
+		 * @return null
+		 */
 		public function logTime($sMarker)
 		{
 		   if(!$this->active)
diff --git a/e107_handlers/e_thumbnail_class.php b/e107_handlers/e_thumbnail_class.php
index cd1ac1bc6..0fe81e5ec 100644
--- a/e107_handlers/e_thumbnail_class.php
+++ b/e107_handlers/e_thumbnail_class.php
@@ -206,7 +206,7 @@ class e_thumbnail
 			return true;
 		}
 
-		if($this->_debug === true)
+		if($this->_debug === true || defined("e_DEBUG_THUMBNAIL"))
 		{
 			echo "File Not Found: ".$path;
 		}