Index: branches/unlabeled/unlabeled-1.10.2/core/units/categories/cache_updater.php
===================================================================
diff -u -r7755 -r7813
--- branches/unlabeled/unlabeled-1.10.2/core/units/categories/cache_updater.php	(.../cache_updater.php)	(revision 7755)
+++ branches/unlabeled/unlabeled-1.10.2/core/units/categories/cache_updater.php	(.../cache_updater.php)	(revision 7813)
@@ -250,6 +250,7 @@
 			$data['category_template']	=	'';
 			$data['item_template']		=	'';
 			$data['children_count'] = 0;
+			$data['system'] = 0;
 			$this->Stack->Push($data);
 		}
 
Index: branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php
===================================================================
diff -u -r7701 -r7813
--- branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 7701)
+++ branches/unlabeled/unlabeled-1.21.2/core/units/languages/languages_config.php	(.../languages_config.php)	(revision 7813)
@@ -143,7 +143,7 @@
 																)
 															),
 					'Fields' => Array(
-										'LanguageId' => Array(),
+										'LanguageId' => Array('type' => 'int'),
 										'PackName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'LocalName' => Array('type' => 'string','not_null' => '1','default' => '','required'=>1),
 										'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => '1',  'default' => 1),
Index: branches/unlabeled/unlabeled-1.8.2/core/units/general/helpers/modules.php
===================================================================
diff -u -r7664 -r7813
--- branches/unlabeled/unlabeled-1.8.2/core/units/general/helpers/modules.php	(.../modules.php)	(revision 7664)
+++ branches/unlabeled/unlabeled-1.8.2/core/units/general/helpers/modules.php	(.../modules.php)	(revision 7813)
@@ -165,7 +165,7 @@
 		    if (isset($modules)) return $modules;
 
 		    $this->_readConfig();
-		    $license = base64_decode($GLOBALS['g_License']);
+		    $license = isset($GLOBALS['g_License']) ? base64_decode($GLOBALS['g_License']) : '';
 		    $this->_ParseLicense($license);
 
 		    $modules = Array();
@@ -182,7 +182,8 @@
 		    else {
 		        $modules = array_keys($this->Application->ModuleInfo);
 		    }
-				array_push($modules, 'Core', 'Proj-base', 'Proj-CMS', 'Custom');
+		    
+			array_push($modules, 'Core', 'Proj-base', 'Proj-CMS', 'Custom');
 		    return $modules;
 		}
 
@@ -205,7 +206,8 @@
 		 */
 		function _GetDomain()
 		{
-			return $this->Application->ConfigValue('DomainDetect') ? $_SERVER['HTTP_HOST'] : $GLOBALS['g_Domain'];
+			$config_domain = isset($GLOBALS['g_Domain']) ? $GLOBALS['g_Domain'] : '';
+			return $this->Application->ConfigValue('DomainDetect') ? $_SERVER['HTTP_HOST'] : $config_domain;
 		}
 
 		function _keyED($txt, $encrypt_key)