diff --git a/modules/node/node.module b/modules/node/node.module
index 4cc6bdf..8b11bc3 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1276,10 +1276,10 @@ function node_search($op = 'search', $keys = NULL) {
         $join2 .= ' LEFT JOIN {node_counter} nc ON nc.nid = i.sid';
         $total += $weight;
       }
-      
-      // When all search factors are disabled (ie they have a weight of zero), 
-      // the default score is based only on keyword relevance and there is no need to 
-      // adjust the score of each item. 
+
+      // When all search factors are disabled (ie they have a weight of zero),
+      // the default score is based only on keyword relevance and there is no need to
+      // adjust the score of each item.
       if ($total == 0) {
         $select2 = 'i.relevance AS score';
         $total = 1;
@@ -1287,7 +1287,7 @@ function node_search($op = 'search', $keys = NULL) {
       else {
         $select2 = implode(' + ', $ranking) . ' AS score';
       }
-      
+
       // Do search.
       $find = do_search($keys, 'node', 'INNER JOIN {node} n ON n.nid = i.sid '. $join1, $conditions1 . (empty($where1) ? '' : ' AND '. $where1), $arguments1, $select2, $join2, $arguments2);
 
@@ -1487,13 +1487,13 @@ function node_menu() {
   $items['node'] = array(
     'title' => 'Content',
     'page callback' => 'node_page_default',
-    'access arguments' => array('access content'),
+    'access arguments' => array('administer content types'),
     'type' => MENU_CALLBACK,
   );
   $items['node/add'] = array(
     'title' => 'Create content',
     'page callback' => 'node_add_page',
-    'access callback' => '_node_add_access',
+    'access arguments' => array('administer content types'),
     'weight' => 1,
     'file' => 'node.pages.inc',
   );
@@ -1715,7 +1715,7 @@ function node_feed($nids = FALSE, $channel = array()) {
         $item->body = $content;
         unset($item->teaser);
       }
-    
+
       // Allow modules to modify the fully-built node.
       node_invoke_nodeapi($item, 'alter', $teaser, FALSE);
     }
diff --git a/modules/storm/stormevent/stormevent.module b/modules/storm/stormevent/stormevent.module
index 9350299..4acf7b8 100644
--- a/modules/storm/stormevent/stormevent.module
+++ b/modules/storm/stormevent/stormevent.module
@@ -644,7 +644,7 @@ function stormevent_storm_dashboard_links($type) {
       'icon' => 'stormcalendar-item',
       'path' => 'calendar',
       'params' => array(),
-      'access_arguments' => 'create stormevent content',
+      'access_arguments' => 'Storm event: access',
       'node_type' => 'stormevent',
       'add_type' => 'stormevent',
       'map' => array(),
diff --git a/modules/storm/stormexpense/stormexpense.module b/modules/storm/stormexpense/stormexpense.module
index 15dc074..7173657 100644
--- a/modules/storm/stormexpense/stormexpense.module
+++ b/modules/storm/stormexpense/stormexpense.module
@@ -726,6 +726,8 @@ function stormexpense_storminvoice_auto_add($node, $invoice_nid = NULL) {
 
     $count = count($new_invoice->items);
 
+    $new_invoice->items[$count] = new StdClass;
+
     $new_invoice->items[$count]->description = $node->title;
     $new_invoice->items[$count]->amount = $node->amount;
     // Tax percent uses the values set on the expense.
diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php
index de126d5..1722f64 100644
--- a/themes/zuitedesk/template.php
+++ b/themes/zuitedesk/template.php
@@ -200,8 +200,8 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
     $submenu .= _zuitedesk_divider($submenu, $partial);
     $partial = '';
     $partial .= _zuitedesk_option(TRUE, '', t('SuiteDesk Tour'), 'help', 'help', t('A beginner\'s guide to SuiteDesk'));
-    $partial .= _zuitedesk_option($deskmenu[2], "$lang/attributes", t('Attributes'), 'attributes', 'help');
-    $partial .= _zuitedesk_option($deskmenu[2], "$lang/admin/settings/suitedesk", t('Configuration'), 'settings', 'help');
+    $partial .= _zuitedesk_option($deskmenu[2], "$lang/attributes", t('Attributes'), 'attributes', 'filter');
+    $partial .= _zuitedesk_option($deskmenu[2], "$lang/admin/settings/suitedesk", t('Configuration'), 'settings', 'storm');
     $submenu .= _zuitedesk_divider($submenu, $partial);
     $pl .= _zuitedesk_submenu($submenu, t('Assistance'), 'assistance');
     // User submenu: