diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index f7d9244db..064af9294 100755
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -2694,7 +2694,7 @@ class pluginBuilder
 			$text .= "<ul class='nav nav-tabs'>\n";
 			$text .= "<li class='active'><a data-toggle='tab' data-bs-toggle='tab' href='#xml'>".EPL_ADLAN_109."</a></li>";
 			
-			$this->tableCount = count($ret['tables']);
+			$this->tableCount = !empty($ret['tables']) ? count($ret['tables']) : 0;
 
 			if(!empty($ret['tables']))
 			{
diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php
index 0993e0a10..01c02ee42 100644
--- a/e107_core/templates/header_default.php
+++ b/e107_core/templates/header_default.php
@@ -821,7 +821,9 @@ e107::getDebug()->logTime('Render Other');
 
 	if(ADMIN && $pref['developer'] && (strpos(e_SELF,'localhost') === false) && (strpos(e_SELF,'127.0.0.1') === false))
 	{
-		echo "<div class='installer alert alert-danger alert-block alert-dismissible text-center'>".e107::getParser()->toHTML(LAN_DEVELOPERMODE_CHECK, true)."<button type='button' class='close btn-close' data-bs-dismiss='alert' data-dismiss='alert' aria-label='".LAN_CLOSE."'></button></div>";
+		$devMessage = e107::getParser()->toHTML(LAN_DEVELOPERMODE_CHECK, true);
+		e107::getMessage()->setTitle("Developer Mode", E_MESSAGE_ERROR)->addError($devMessage);
+		// echo "<div class='installer alert alert-danger alert-block alert-dismissible text-center'>".e107::getParser()->toHTML(LAN_DEVELOPERMODE_CHECK, true)."<button type='button' class='close btn-close' data-bs-dismiss='alert' data-dismiss='alert' aria-label='".LAN_CLOSE."'></button></div>";
 	}
 
 	
diff --git a/e107_themes/bootstrap3/css/modern-light.css b/e107_themes/bootstrap3/css/modern-light.css
index 844f6a68f..0f5eb0f2c 100644
--- a/e107_themes/bootstrap3/css/modern-light.css
+++ b/e107_themes/bootstrap3/css/modern-light.css
@@ -1649,7 +1649,7 @@ ul.col-selection { background-color: #FCFDFF; }
 #admin-menus #sc-admin-help ,
 #admin-menus .admin-ui-nav-menu { background: #373737 }
 h4.caption { margin-bottom: 15px !important; }
-.s-message-body .well { color: white; }
+.s-message-body .well, s-message-item pre { color: white; }