diff --git a/fusion_accelerator.module b/fusion_accelerator.module
index 2d02f299596aa2fc314a32af285abee71010ce6a..860c632143d52d43b05350e22368da0515dbf513 100644
--- a/fusion_accelerator.module
+++ b/fusion_accelerator.module
@@ -111,7 +111,7 @@ function fusion_accelerator_form_system_theme_settings_alter(&$form, &$form_stat
   // Only add these options to Fusion themes.
   $theme_name = $form_state['build_info']['args'][0];
   $theme_data = list_themes();
-  if (!isset($theme_data[$theme_name]->base_theme) || !$theme_data[$theme_name]->base_theme == 'fusion_core') {
+  if (!isset($theme_data[$theme_name]->base_theme) || (isset($theme_data[$theme_name]->base_theme) && $theme_data[$theme_name]->base_theme != 'fusion_core')) {
     return;
   }
 
diff --git a/fusion_apply/fusion_apply_ui.module b/fusion_apply/fusion_apply_ui.module
index b27a3b97aba73165a3a56307d9b07c48cd5d69ed..969ccb690d6e26964e1c9c17093f279b26ad9f7c 100644
--- a/fusion_apply/fusion_apply_ui.module
+++ b/fusion_apply/fusion_apply_ui.module
@@ -34,7 +34,7 @@ function fusion_apply_ui_menu() {
     'page arguments' => array('fusion_apply_ui_list'),
     'access arguments' => array('administer fusion'),
     'file' => 'fusion_apply_ui.admin.inc',
-    'type' => MENU_NORMAL_ITEM,
+    'type' => MENU_LOCAL_TASK,
   );
   $items['admin/appearance/fusion/list'] = array(
     'title' => 'Applied skins',
@@ -113,7 +113,7 @@ function fusion_apply_ui_menu() {
     'title' => 'Import',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('fusion_apply_ui_import_form'),
-    'type' => MENU_LOCAL_TASK,
+    'type' => MENU_LOCAL_ACTION,
     'access arguments' => array('administer fusion'),
     'weight' => -4,
     'description' => t('Import skin configurations.'),
@@ -123,7 +123,7 @@ function fusion_apply_ui_menu() {
     'title' => 'Export',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('fusion_apply_ui_export_form'),
-    'type' => MENU_LOCAL_TASK,
+    'type' => MENU_LOCAL_ACTION,
     'access arguments' => array('administer fusion'),
     'weight' => -5,
     'description' => t('Export skin configurations.'),