diff --git a/src/components/App.jsx b/src/components/App.jsx
index c7bf3fd2..c985cc73 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -88,14 +88,13 @@ export default class App extends React.Component {
   }
 
   componentDidMount() {
-    this.fetchSources();
-    Mousetrap.bind(['ctrl+z'], this.onUndo.bind(this));
-    Mousetrap.bind(['ctrl+y'], this.onRedo.bind(this));
+    Mousetrap.bind(['mod+z'], this.onUndo.bind(this));
+    Mousetrap.bind(['mod+y', 'mod+shift+z'], this.onRedo.bind(this));
   }
 
   componentWillUnmount() {
-    Mousetrap.unbind(['ctrl+z'], this.onUndo.bind(this));
-    Mousetrap.unbind(['ctrl+y'], this.onRedo.bind(this));
+    Mousetrap.unbind(['mod+z'], this.onUndo.bind(this));
+    Mousetrap.unbind(['mod+y', 'mod+shift+z'], this.onRedo.bind(this));
   }
 
   saveStyle(snapshotStyle) {
diff --git a/src/components/modals/SourcesModal.jsx b/src/components/modals/SourcesModal.jsx
index c1868e7c..b5db455b 100644
--- a/src/components/modals/SourcesModal.jsx
+++ b/src/components/modals/SourcesModal.jsx
@@ -234,7 +234,7 @@ class SourcesModal extends React.Component {
       <div className="maputnik-modal-section">
         <h4>Choose Public Source</h4>
         <p>
-          Add one of the publicly availble sources to your style.
+          Add one of the publicly available sources to your style.
         </p>
         <div style={{maxwidth: 500}}>
         {tilesetOptions}