diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index bc0336729..e6507fcdd 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -475,7 +475,7 @@ class e_menuManager
 	/**
 	 * @return void
 	 */
-	function menuScanMenus()
+	public function menuScanMenus()
 	{
 		global $sql2;
 		$sql = e107::getDb();
@@ -484,7 +484,7 @@ class e_menuManager
 		$efile->dirFilter = array('/', 'CVS', '.svn', 'languages');
 		$efile->fileFilter[] = '^e_menu\.php$';
 
-		$fileList = $efile->get_files(e_PLUGIN, "_menu\.php$", 'standard', 2);
+		$fileList = $efile->get_files(e_PLUGIN, "_menu\.php$", 'standard', 1);
 
 		//	$this->menuAddMessage('Scanning for new menus', E_MESSAGE_DEBUG);
 
@@ -2901,7 +2901,7 @@ class e_mm_layout
 	{
 		$fl 			= e107::getFile();
 		$fl->dirFilter 	= array('/', 'CVS', '.svn', 'languages');
-		$files 			= $fl->get_files(e_PLUGIN,"_menu\.php$",'standard',2);
+		$files 			= $fl->get_files(e_PLUGIN,"_menu\.php$",'standard',1);
 
 		$data = array();
 
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 8ebbbf6c3..9f195de16 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -3258,12 +3258,12 @@ class e107plugin
 
 			unset($attrib['read'], $attrib['write'], $attrib['applicable'], $attrib['required'], $attrib['fieldType']);
 
-			$name = $this->ue_field_name($plug, EUF_ADDON, $field);
+			$name = $this->ue_field_name($plug, defset('EUF_ADDON'), $field);
 
 			$insert = array(
 					'name'      => $name,
 					'text'      => varset($attrib['title'], "None Specified"),
-					'type'      => EUF_ADDON,
+					'type'      => defset('EUF_ADDON'),
 					'parms'     => $plug,
 					'values'    => e107::serialize($attrib, 'json'),
 					'default'   => null,
diff --git a/e107_tests/tests/unit/pluginsTest.php b/e107_tests/tests/unit/pluginsTest.php
index 58b8de013..46c074128 100644
--- a/e107_tests/tests/unit/pluginsTest.php
+++ b/e107_tests/tests/unit/pluginsTest.php
@@ -126,8 +126,9 @@
 		{
 		//	$this->_debugPlugin = '_blank';
 
-			$this->pluginInstall('_blank');
+			$result = $this->pluginInstall('_blank');
 
+		//	print_r($result);
 		//	$this->pluginUninstall('_blank');
 
 
@@ -578,6 +579,8 @@
 			{
 				$this->assertTrue($val, $key." list pref is missing for ".$pluginDir);
 			}
+
+			return $install;
 		}
 
 		private function pluginUninstall($pluginDir, $opts=array())