diff --git a/menu_block.module b/menu_block.module
index ae1c4c4..cde6844 100644
--- a/menu_block.module
+++ b/menu_block.module
@@ -33,12 +33,14 @@ function menu_block_form_block_admin_display_form_alter(&$form, $form_state) {
   module_load_include('inc', 'menu_block', 'menu_block.admin');
   return _menu_block_form_block_admin_display_form_alter($form, $form_state);
 }
-/* -- temporarily remove until ctools is ported to D7.
+
+/**
+ * Implements hook_ctools_plugin_directory().
+ */
 function menu_block_ctools_plugin_directory($module, $plugin) {
   module_load_include('inc', 'menu_block', 'menu_block.admin');
   return _menu_block_ctools_plugin_directory($module, $plugin);
 }
-*/
 
 /**
  * Implements hook_menu().
diff --git a/plugins/content_types/menu_tree/menu_tree.inc b/plugins/content_types/menu_tree/menu_tree.inc
index 8572ed7..d30e6d0 100644
--- a/plugins/content_types/menu_tree/menu_tree.inc
+++ b/plugins/content_types/menu_tree/menu_tree.inc
@@ -116,6 +116,7 @@ function menu_block_menu_tree_content_type_edit_form(&$form, &$form_state) {
   }
   // Remove CSS class hooks for jQuery script on parent select.
   unset($form['parent']['#attributes']);
+  return $form;
 }
 
 /**