diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 6ae4ec219..1969eb105 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -773,7 +773,7 @@ class page_admin_ui extends e_admin_ui
 			}
 				
 
-			if($this->getAction() == 'create' && e_DEBUG === true)
+			if($this->getAction() == 'create' && deftrue('e_DEBUG'))
 			{
 
 				$tmp = e107::getCoreTemplate('page', 'default');
diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php
index 4d4858fe9..7b034bb6d 100644
--- a/e107_handlers/file_class.php
+++ b/e107_handlers/file_class.php
@@ -1655,7 +1655,7 @@ class e_file
 					$zip->extractTo(e_TEMP);
 					chmod(e_TEMP . $dir, 0755);
 
-					if(empty($dir) && e_DEBUG)
+					if(empty($dir) && deftrue('e_DEBUG'))
 					{
 						print_a($fileinfo);
 					}
diff --git a/e107_handlers/iphandler_class.php b/e107_handlers/iphandler_class.php
index 811fb84e9..7f5b3fc09 100644
--- a/e107_handlers/iphandler_class.php
+++ b/e107_handlers/iphandler_class.php
@@ -394,7 +394,7 @@ class eIPHandler
 
 		if(!is_readable($fileName)) // Note readable, but the IP is still banned, so half further script execution.
 		{
-			if($this->debug === true || e_DEBUG === true)
+			if($this->debug === true || defset('e_DEBUG') === true)
 			{
 				echo "Your IP is banned!";
 			}
diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index 3bef261d2..5d84f2f27 100644
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -176,7 +176,7 @@ if(!class_exists('plugin_pm_pm_shortcodes'))
 			{
 				$frm = e107::getForm();
 
-				$exclude = (getperms('0') && e_DEBUG === true) ? false : true;
+				$exclude = (getperms('0') && deftrue('e_DEBUG')) ? false : true;
 
 				$ret = $frm->userlist('pm_to',null,array('excludeSelf'=>$exclude, 'default'=>'blank', 'classes'=>varset($this->pmPrefs['send_to_class'], e_UC_MEMBER)));
 			}