diff --git a/js/components/ascribe_routes/proxy_handler.js b/js/components/ascribe_routes/proxy_handler.js
index 52084e6b..882fe65c 100644
--- a/js/components/ascribe_routes/proxy_handler.js
+++ b/js/components/ascribe_routes/proxy_handler.js
@@ -17,7 +17,7 @@ const WHEN_ENUM = ['loggedIn', 'loggedOut'];
  *
  * @param {enum/string} options.when ('loggedIn' || 'loggedOut')
  */
-export function AuthRedirect({to, when}) {
+export function AuthRedirect({ to, when }) {
     // validate `when`, must be contained in `WHEN_ENUM`.
     // Throw an error otherwise.
     if (WHEN_ENUM.indexOf(when) === -1) {
@@ -80,8 +80,8 @@ export function ProxyHandler(...redirectFunctions) {
             displayName: 'ProxyHandler',
 
             propTypes: {
-                // Provided from AscribeApp
-                currentUser: React.PropTypes.object.isRequired,
+                // Provided from AscribeApp, after the routes have been initialized
+                currentUser: React.PropTypes.object,
                 whitelabel: React.PropTypes.object,
 
                 // Provided from router
diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
index 6a59b8fc..5df3558c 100644
--- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
+++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_dialog.js
@@ -84,6 +84,7 @@ let FileDragAndDropDialog = React.createClass({
                 dialogElement = [
                     this.getDragDialog(fileClassToUpload.plural),
                     (<span
+                        key='mutlipleFilesBtn'
                         className="btn btn-default"
                         onClick={onClick}>
                             {getLangText('choose %s to upload', fileClassToUpload.plural)}
@@ -96,6 +97,7 @@ let FileDragAndDropDialog = React.createClass({
                 dialogElement = [
                     this.getDragDialog(fileClassToUpload.singular),
                     (<span
+                        key='singleFileBtn'
                         className="btn btn-default"
                         onClick={onClick}>
                             {dialog}
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index ff44b294..90a72157 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -487,7 +487,7 @@ const ReactS3FineUploader = React.createClass({
         return (enableLocalHashing && !uploadMethod) ||
                 !areAssetsEditable ||
                 (showErrorPrompt && errorState.errorClass) ||
-                (!multiple && filesToDisplay.length);
+                (!multiple && filesToDisplay.length > 0);
     },
 
     isFileValid(file) {