diff --git a/storm_handler_field_operation.inc b/storm_handler_field_operation.inc
index 8cd1859..cff5e33 100644
--- a/storm_handler_field_operation.inc
+++ b/storm_handler_field_operation.inc
@@ -40,6 +40,7 @@ class storm_handler_field_operation extends views_handler_field_node_link {
     $node->uid = $values->{$this->aliases['uid']};
     $node->type = $values->{$this->aliases['type']};
     $node->format = $values->{$this->aliases['format']};
+    //TODO add stormorganization_nid and assigned_nid!
     $node->status = 1; // unpublished nodes ignore access control
     if ($this->options['display_icons']) {
       $value = "";
diff --git a/stormticket/stormticket.theme.inc b/stormticket/stormticket.theme.inc
index 675eafb..e20b858 100644
--- a/stormticket/stormticket.theme.inc
+++ b/stormticket/stormticket.theme.inc
@@ -8,12 +8,6 @@ function theme_stormticket_list($header, $tickets) {
 
   $rows = array();
   foreach ($tickets as $ticket) {
-    $n = new stdClass();
-    $n->nid = $ticket->nid;
-    $n->uid = $ticket->uid;
-    $n->organization_nid = $ticket->organization_nid;
-    $n->type = 'stormticket';
-
     $rows[] = array(
       storm_icon('category_'. $ticket->ticketcategory, storm_attribute_value('Ticket category', $ticket->ticketcategory)),
       l($ticket->organization_title, 'node/'. $ticket->organization_nid),
@@ -23,7 +17,7 @@ function theme_stormticket_list($header, $tickets) {
       storm_icon('status_'. $ticket->ticketstatus, storm_attribute_value('Ticket status', $ticket->ticketstatus)),
       storm_icon('priority_'. $ticket->ticketpriority, storm_attribute_value('Ticket priority', $ticket->ticketpriority)),
       array(
-        'data' => storm_icon_edit_node($n, $_GET) .' '. storm_icon_delete_node($n, $_GET),
+        'data' => storm_icon_edit_node($ticket, $_GET) .' '. storm_icon_delete_node($ticket, $_GET),
         'class' => 'storm_list_operations',
       ),
     );