diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx
index 2af281b11..c4617371f 100755
--- a/internal_packages/message-list/lib/message-list.cjsx
+++ b/internal_packages/message-list/lib/message-list.cjsx
@@ -198,9 +198,9 @@ MessageList = React.createClass
         next = @state.messages[idx + 1]
         nextCollapsed = next and !@state.messagesExpandedState[next.id]
         if collapsed and nextCollapsed
-          components.push <hr className="message-item-divider collapsed" />
+          components.push <hr key={idx} className="message-item-divider collapsed" />
         else
-          components.push <hr className="message-item-divider" />
+          components.push <hr key={idx} className="message-item-divider" />
 
     components
 
diff --git a/spec-inbox/stores/database-store-spec.coffee b/spec-inbox/stores/database-store-spec.coffee
index 70bce51af..9da4286cd 100644
--- a/spec-inbox/stores/database-store-spec.coffee
+++ b/spec-inbox/stores/database-store-spec.coffee
@@ -58,7 +58,7 @@ testModelInstanceB = new TestModel(id: 'BBB')
 describe "DatabaseStore", ->
   beforeEach ->
     spyOn(ModelQuery.prototype, 'where').andCallThrough()
-    spyOn(DatabaseStore, 'trigger').andCallThrough()
+    spyOn(DatabaseStore, 'trigger')
 
     @performed = []
     @transactionCount = 0