diff --git a/internal_packages/message-list/lib/message-item.cjsx b/internal_packages/message-list/lib/message-item.cjsx
index d778f439d..3101ea85f 100644
--- a/internal_packages/message-list/lib/message-item.cjsx
+++ b/internal_packages/message-list/lib/message-item.cjsx
@@ -107,7 +107,7 @@ MessageItem = React.createClass
     AttachmentComponent = @state.AttachmentComponent
     attachments = _.filter @props.message.files, (f) -> not f.contentId?
     attachments.map (file) =>
-      <AttachmentComponent file={file} download={@state.downloads[file.id]}/>
+      <AttachmentComponent file={file} key={file.id} download={@state.downloads[file.id]}/>
 
   _messageIsEmptyForward: ->
     # Returns true if the message contains "Forwarded" or "Fwd" in the first 250 characters.
diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx
index 720b32779..e163e3335 100755
--- a/internal_packages/message-list/lib/message-list.cjsx
+++ b/internal_packages/message-list/lib/message-list.cjsx
@@ -40,7 +40,7 @@ MessageList = React.createClass
   render: ->
     return <div></div> if not @state.current_thread?
 
-    <div class="message-list" id="message-list">
+    <div className="message-list" id="message-list">
       <div tabIndex=1 className="messages-wrap">
         {@_oldMessageListHeaders()}
 
diff --git a/internal_packages/thread-list/keymaps/thread-list.cson b/internal_packages/thread-list/keymaps/thread-list.cson
index 1285a3dfe..d6e2826d9 100644
--- a/internal_packages/thread-list/keymaps/thread-list.cson
+++ b/internal_packages/thread-list/keymaps/thread-list.cson
@@ -7,7 +7,7 @@
 
 # For more detailed documentation see
 # https://atom.io/docs/latest/advanced/keymaps
-'.thread-list-container':
+'.thread-list':
   's'     : 'thread-list:star-thread' # Gmail
   'cmd-L' : 'thread-list:star-thread' # Mac mail
   'ctrl-G': 'thread-list:star-thread' # Outlook
diff --git a/internal_packages/thread-list/lib/thread-list-mixin.cjsx b/internal_packages/thread-list/lib/thread-list-mixin.cjsx
index f12f6efbf..805d99c81 100644
--- a/internal_packages/thread-list/lib/thread-list-mixin.cjsx
+++ b/internal_packages/thread-list/lib/thread-list-mixin.cjsx
@@ -8,7 +8,7 @@ ThreadListMixin =
 
   componentDidMount: ->
     @thread_store_unsubscribe = ThreadStore.listen @_onChange
-    @thread_unsubscriber = atom.commands.add '.thread-list-container', {
+    @thread_unsubscriber = atom.commands.add '.thread-list', {
       'thread-list:star-thread': => @_onStarThread()
     }
     @body_unsubscriber = atom.commands.add 'body', {
diff --git a/internal_packages/thread-list/lib/thread-list-tabular.cjsx b/internal_packages/thread-list/lib/thread-list-tabular.cjsx
index ffdb5d792..59d8987e8 100644
--- a/internal_packages/thread-list/lib/thread-list-tabular.cjsx
+++ b/internal_packages/thread-list/lib/thread-list-tabular.cjsx
@@ -30,7 +30,7 @@ ThreadListTabular = React.createClass
     unlisten() for unlisten in @unlisteners
 
   render: ->
-    <div class="thread-list" id="thread-list">
+    <div className="thread-list" id="thread-list">
       <div tabIndex=1
            className="thread-list-container thread-list-tabular">
 
diff --git a/internal_packages/thread-list/spec/thread-list-spec.cjsx b/internal_packages/thread-list/spec/thread-list-spec.cjsx
index a73d791e2..46d9f1b60 100644
--- a/internal_packages/thread-list/spec/thread-list-spec.cjsx
+++ b/internal_packages/thread-list/spec/thread-list-spec.cjsx
@@ -234,7 +234,7 @@ describe "ThreadListTabular", ->
     expect(ReactTestUtils.isCompositeComponentWithType(@thread_list,
                                           ThreadListTabular)).toBe true
 
-  it "archives on keymap", ->
+  it "stars on keymap", ->
     spyOn(@thread_list, "_onStarThread")
     InboxTestUtils.keyPress("s", @thread_list.getDOMNode())
     expect(@thread_list._onStarThread).toHaveBeenCalled()
diff --git a/src/flux/models/utils.coffee b/src/flux/models/utils.coffee
index 2bd3dcea7..09945dcc6 100644
--- a/src/flux/models/utils.coffee
+++ b/src/flux/models/utils.coffee
@@ -85,7 +85,6 @@ Utils =
       files = fs.listTreeSync('./static/images')
       for file in files
         Utils.images[path.basename(file)] = file.substr(7)
-      console.log('Loaded Images', Utils.images)
 
     if window.devicePixelRatio > 1
       return Utils.images["#{name}@2x.#{ext}"] ? Utils.images[fullname] ? Utils.images["#{name}@1x.#{ext}"]
diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee
index 1f999492e..f9c8f6f4a 100644
--- a/src/theme-manager.coffee
+++ b/src/theme-manager.coffee
@@ -30,7 +30,7 @@ class ThemeManager
     stylesElement.onDidRemoveStyleElement @styleElementRemoved.bind(this)
     stylesElement.onDidUpdateStyleElement @styleElementUpdated.bind(this)
 
-    if atom.inDevMode()
+    if atom.inDevMode() and not atom.inSpecMode()
       console.log('In Dev Mode - Watching /static for LESS changes')
       watchStylesIn = (folder) =>
         stylePaths = fs.listTreeSync(folder)