diff --git nodehierarchy.module nodehierarchy.module
old mode 100644
new mode 100755
index 2fbdb1d..e7ff452
--- nodehierarchy.module
+++ nodehierarchy.module
@@ -232,7 +232,7 @@ function nodehierarchy_menu_overview_form(&$form_state, $menu) {
   }
   // Use the default menu behaviour unless specified.
   if (variable_get('nodehierarchy_menu_module_edit', TRUE)) {
-    $form = menu_overview_form(&$form_state, $menu);
+    $form = menu_overview_form($form_state, $menu);
   }
   else {
     global $menu_admin;
@@ -1153,9 +1153,9 @@ function _nodehierarchy_parent_options($child_type, $exclude = NULL) {
   if ($type_names) {
     $result = db_query(
                       "SELECT plid, menu_links.mlid, link_title, depth, weight, parent_node.type as type 
-                         FROM {menu_links}
+                         FROM {menu_links} menu_links
                     LEFT JOIN {nodehierarchy_menu_links} nh_parent 
-                           ON {menu_links}.mlid = nh_parent.mlid
+                           ON menu_links.mlid = nh_parent.mlid
                     LEFT JOIN {node} parent_node
                            ON nh_parent.nid = parent_node.nid
                         WHERE module = 'nodehierarchy'