diff --git a/src/components/AppLayout.jsx b/src/components/AppLayout.jsx
index 63fc5c6c..8ea4cae5 100644
--- a/src/components/AppLayout.jsx
+++ b/src/components/AppLayout.jsx
@@ -9,6 +9,7 @@ class AppLayout extends React.Component {
     layerEditor: PropTypes.element,
     map: PropTypes.element.isRequired,
     bottom: PropTypes.element,
+    modals: PropTypes.node,
   }
 
   static childContextTypes = {
diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx
index 2f7002dc..b0a0b729 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar.jsx
@@ -37,6 +37,7 @@ class ToolbarLink extends React.Component {
     className: PropTypes.string,
     children: PropTypes.node,
     href: PropTypes.string,
+    onToggleModal: PropTypes.func,
   }
 
   render() {
diff --git a/src/components/modals/ShortcutsModal.jsx b/src/components/modals/ShortcutsModal.jsx
index 0aa0a7f9..6a17e4bf 100644
--- a/src/components/modals/ShortcutsModal.jsx
+++ b/src/components/modals/ShortcutsModal.jsx
@@ -60,7 +60,7 @@ class ShortcutsModal extends React.Component {
         </p>
         <ul>
           {help.map((item) => {
-            return <li>
+            return <li key={item.key}>
               <code>{item.key}</code> {item.text}
             </li>
           })}