diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a7de60d..74c22163 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 # Version 4.0.0 Prereleases
 
+## 4.0.0-beta.4 (Oct 31, 2018)
+
+- Add support for Create React App access token environment variable (#633)
+- Upgrade function ref to createRef (#637)
+- API audit (#638)
+- Do not call onResize during render (#643)
+
 ## 4.0.0-beta.3 (Oct 24, 2018)
 
 - Fix render error when using `viewState` instead of flat props (#632)
diff --git a/package.json b/package.json
index b29aafd9..33f50534 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-map-gl",
   "description": "A React wrapper for MapboxGL-js and overlay API.",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.4",
   "keywords": [
     "mapbox",
     "mapbox-gl",
@@ -44,7 +44,7 @@
     "@babel/runtime": "^7.0.0",
     "mapbox-gl": "~0.50.0",
     "math.gl": "^2.0.0",
-    "mjolnir.js": "^2.0.0-alpha.2",
+    "mjolnir.js": "^2.0.0",
     "prop-types": "^15.5.7",
     "react-virtualized-auto-sizer": "^1.0.2",
     "viewport-mercator-project": "^6.0.0"
diff --git a/src/components/interactive-map.js b/src/components/interactive-map.js
index 803072d5..aa3c5c31 100644
--- a/src/components/interactive-map.js
+++ b/src/components/interactive-map.js
@@ -192,8 +192,7 @@ export default class InteractiveMap extends PureComponent {
 
   _setControllerProps(props) {
     props = Object.assign({}, props, props.viewState, {
-      isInteractive: Boolean(props.onViewStateChange ||
-        props.onViewportChange || props.onChangeViewport),
+      isInteractive: Boolean(props.onViewStateChange || props.onViewportChange),
       onViewportChange: this._onViewportChange,
       onStateChange: this._onInteractionStateChange,
       eventManager: this._eventManager,
@@ -243,8 +242,7 @@ export default class InteractiveMap extends PureComponent {
   }
 
   _onViewportChange = (viewState, interactionState, oldViewState) => {
-    const onViewStateChange = this.props.onViewStateChange;
-    const onViewportChange = this.props.onViewportChange || this.props.onChangeViewport;
+    const {onViewStateChange, onViewportChange} = this.props;
 
     if (onViewStateChange) {
       onViewStateChange({viewState, interactionState, oldViewState});
diff --git a/src/components/navigation-control.js b/src/components/navigation-control.js
index 5c9e7c8f..377093b9 100644
--- a/src/components/navigation-control.js
+++ b/src/components/navigation-control.js
@@ -53,9 +53,7 @@ export default class NavigationControl extends BaseControl {
     this.props.onViewStateChange({viewState});
 
     // Call old style callback
-    // TODO(deprecate): remove this check when `onChangeViewport` gets deprecated
-    const onViewportChange = this.props.onChangeViewport || this.props.onViewportChange;
-    onViewportChange(viewState);
+    this.props.onViewportChange(viewState);
   }
 
   _onZoomIn = () => {
diff --git a/yarn.lock b/yarn.lock
index 158e5f46..09729b73 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6159,10 +6159,10 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mjolnir.js@^2.0.0-alpha.1:
-  version "2.0.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/mjolnir.js/-/mjolnir.js-2.0.0-alpha.1.tgz#5721f7864cf33d3e2aa5828659a28fcd1b2f8197"
-  integrity sha512-AQk4H9p8FI4R7SYtNzcYqiCPxhHjI39BRfNbF4RxZKabx1PZ5hcf1dSmu6v1jmWRI2QqY+ek1MqsGXd1qOc81Q==
+mjolnir.js@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mjolnir.js/-/mjolnir.js-2.0.0.tgz#8475d2fb3b09780dbff122f245c6b3ddc46fc41e"
+  integrity sha512-2OfO77sNbPBlPl3ptU/EdDA/f482C/WunbDPkQyUmqkxGi88qQyvSEyxWGWV3Zw5RAHrWzLx1rH6htTFkzaOKg==
   dependencies:
     "@babel/runtime" "^7.0.0"
     hammerjs "^2.0.8"