diff --git a/app/debrief_svc.py b/app/debrief_svc.py
index daf4c17..c956782 100644
--- a/app/debrief_svc.py
+++ b/app/debrief_svc.py
@@ -25,14 +25,14 @@ async def build_steps_d3(self, operation_ids):
 
         for operation in operations:
             # Add operation node
-            graph_output['nodes'].append(dict(name=operation.name, type='operation', id=op_id, img='operation',
+            graph_output['nodes'].append(dict(name=operation.name, type='operation', id=operation.id, img='operation',
                                               timestamp=self._format_timestamp(operation.created)))
 
             # Add agents for this operation
             agents = [x for x in operation.agents if x]
             self._add_agents_to_d3(agents, id_store, graph_output)
             for agent in agents:
-                graph_output['links'].append(dict(source=op_id,
+                graph_output['links'].append(dict(source=operation.id,
                                                   target=id_store['agent' + agent.unique],
                                                   type='has_agent'))
 
@@ -42,12 +42,12 @@ async def build_steps_d3(self, operation_ids):
                 link_graph_id = id_store['link' + link.unique] = max(id_store.values()) + 1
                 display_name = link.ability.name + (' (cleanup)' if link.cleanup else '')
                 graph_output['nodes'].append(dict(type='link', name='link:'+link.unique, id=link_graph_id,
-                                                  status=link.status, operation=op_id, img=link.ability.tactic,
+                                                  status=link.status, operation=operation.id, img=link.ability.tactic,
                                                   attrs=dict(status=link.status, name=display_name),
                                                   timestamp=self._format_timestamp(link.created)))
 
                 if not previous_link_graph_id:
-                    graph_output['links'].append(dict(source=op_id, target=link_graph_id, type='next_link'))
+                    graph_output['links'].append(dict(source=operation.id, target=link_graph_id, type='next_link'))
                 else:
                     graph_output['links'].append(dict(source=previous_link_graph_id, target=link_graph_id,
                                                       type='next_link'))
diff --git a/app/objects/c_story.py b/app/objects/c_story.py
index 0109405..b1a6023 100644
--- a/app/objects/c_story.py
+++ b/app/objects/c_story.py
@@ -99,12 +99,16 @@ def adjust_icon_svgs(path):
         for icon_svg in svg.getroot().iter("{http://www.w3.org/2000/svg}svg"):
             if icon_svg.get('id') == 'copy-svg':
                 continue
-            viewbox = [int(float(val)) for val in icon_svg.get('viewBox').split()]
+            viewbox_attr = icon_svg.get('viewBox')
+            if not viewbox_attr:
+                continue
+            viewbox = [int(float(val)) for val in viewbox_attr.split()]
             aspect = viewbox[2] / viewbox[3]
             icon_svg.set('width', str(round(float(icon_svg.get('height')) * aspect)))
             if not icon_svg.get('id') or 'legend' not in icon_svg.get('id'):
                 icon_svg.set('x', '-' + str(int(icon_svg.get('width')) / 2))
-        svg.write(open(path, 'wb'))
+        with open(path, 'wb') as f:
+            svg.write(f)
 
     @staticmethod
     def get_table_object(val):