diff --git a/client/app/lib/components/common/popover.coffee b/client/app/lib/components/common/popover.coffee
index 1aaa355e3e6..c23facdca65 100644
--- a/client/app/lib/components/common/popover.coffee
+++ b/client/app/lib/components/common/popover.coffee
@@ -33,6 +33,8 @@ module.exports = class Popover extends React.Component
 
   render: ->
 
-    <Portal {...@props} className={kd.utils.curry 'Popover', @props.className}>
-      <div className="Popover-Wrapper" ref='Popover'>{@props.children}</div>
+    <Portal {...@props}>
+      <div className={kd.utils.curry 'Popover', @props.className}>
+        <div className="Popover-Wrapper" ref='Popover'>{@props.children}</div>
+      </div>
     </Portal>
diff --git a/client/app/lib/components/profile/profilefetchermixin.coffee b/client/app/lib/components/profile/profilefetchermixin.coffee
index 38ce627d232..31e4be0ac56 100644
--- a/client/app/lib/components/profile/profilefetchermixin.coffee
+++ b/client/app/lib/components/profile/profilefetchermixin.coffee
@@ -2,7 +2,7 @@ React = require 'app/react'
 helper = require './helper'
 fetchAccount = require 'app/util/fetchAccount'
 
-module.exports =
+module.exports = ProfileFetcherMixin =
 
 
   getInitialState: ->
diff --git a/client/app/lib/util/showSaveDialog.coffee b/client/app/lib/util/showSaveDialog.coffee
index 40d4ca36bfd..5e530614c28 100644
--- a/client/app/lib/util/showSaveDialog.coffee
+++ b/client/app/lib/util/showSaveDialog.coffee
@@ -16,10 +16,12 @@ module.exports = (container, callback = kd.noop, options = {}) ->
     container     : container
     height        : 'auto'
     buttons       :
-      SAVE        :
+      save        :
+        title     : 'SAVE'
         style     : 'GenericButton primary'
         callback  : -> callback input, finderController, dialog
-      CANCEL      :
+      cancel      :
+        title     : 'CANCEL'
         style     : 'GenericButton cancel'
         callback  : ->
           finderController.stopAllWatchers()
@@ -38,7 +40,7 @@ module.exports = (container, callback = kd.noop, options = {}) ->
     label        : label
     defaultValue : options.inputDefaultValue or ''
     keydown      : (event) ->
-      dialog.buttons.Save.click()  if event.which is 13
+      dialog.buttons.save.click()  if event.which is 13
 
   dialog.on 'KDObjectWillBeDestroyed', ->
     container.ace?.focus()