diff --git a/client/coral-admin/src/components/CommentList.js b/client/coral-admin/src/components/CommentList.js
index 326d63cf1..a1a990490 100644
--- a/client/coral-admin/src/components/CommentList.js
+++ b/client/coral-admin/src/components/CommentList.js
@@ -25,9 +25,7 @@ export default class CommentList extends React.Component {
     loading: PropTypes.bool,
 
     // list of actions (flags, etc) associated with the comments
-    actions: PropTypes.shape({
-      ids: PropTypes.arrayOf(PropTypes.string)
-    }),
+    actions: PropTypes.arrayOf(PropTypes.string),
     suspectWords: PropTypes.arrayOf(PropTypes.string)
   }
 
diff --git a/client/coral-ui/components/Dialog.js b/client/coral-ui/components/Dialog.js
index 9af9be6dd..17cb78d28 100644
--- a/client/coral-ui/components/Dialog.js
+++ b/client/coral-ui/components/Dialog.js
@@ -42,7 +42,9 @@ export default class Dialog extends Component {
 
   componentWillUnmount() {
     const dialog = this.dialog;
-    dialog.removeEventListener('cancel', this.props.onCancel);
+    if (dialog) {
+      dialog.removeEventListener('cancel', this.props.onCancel);      
+    }
   }
 
   render() {
diff --git a/routes/api/comments/index.js b/routes/api/comments/index.js
index 39b4b02bc..21426d217 100644
--- a/routes/api/comments/index.js
+++ b/routes/api/comments/index.js
@@ -137,7 +137,7 @@ router.post('/', wordlist.filter('body'), (req, res, next) => {
   .then((comment) => {
     if (req.wordlist.suspect) {
       return Comment
-        .addAction(comment.id, null, 'flag', 'body', 'Matched suspect word filters.')
+        .addAction(comment.id, null, 'flag', {field: 'body', details: 'Matched suspect word filters.'})
         .then(() => comment);
     }
 
diff --git a/tests/routes/api/comments/index.js b/tests/routes/api/comments/index.js
index 1c782e405..3af37cada 100644
--- a/tests/routes/api/comments/index.js
+++ b/tests/routes/api/comments/index.js
@@ -225,8 +225,9 @@ describe('/api/v1/comments', () => {
           let action = actions[0];
 
           expect(action).to.have.property('item_id', comment.id);
-          expect(action).to.have.property('field', 'body');
-          expect(action).to.have.property('detail', 'Matched suspect word filters.');
+          expect(action).to.have.property('metadata');
+          expect(action.metadata).to.have.property('field', 'body');
+          expect(action.metadata).to.have.property('details', 'Matched suspect word filters.');
         });
     });