diff --git a/modules/native-ios b/modules/native-ios
index e17cd93..541a44a 160000
--- a/modules/native-ios
+++ b/modules/native-ios
@@ -1 +1 @@
-Subproject commit e17cd93b1b27ce6c971690cbd3757d6ad3ab37a8
+Subproject commit 541a44aface29b0f804c0cc51aefd32b8f2a5211
diff --git a/modules/timestep b/modules/timestep
index 45a2274..ea54d8d 160000
--- a/modules/timestep
+++ b/modules/timestep
@@ -1 +1 @@
-Subproject commit 45a227482906faea696cc4d452c22a51aab5e39f
+Subproject commit ea54d8d5a463bd645160210f941a6f354f66baea
diff --git a/package.json b/package.json
index 99fa6fe..0a47bd9 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "devkit-core",
   "author": "Game Closure",
-  "description": "DevKit client API",
-  "version": "2.0.15",
+  "description": "devkit engine",
+  "version": "2.1.4",
   "repository": {
     "type": "git",
-    "url": "http://github.com/gameclosure/gcapi/gcapi.git"
+    "url": "http://github.com/gameclosure/devkit-core.git"
   },
   "dependencies": {
     "cli-color": "^0.3.2",
diff --git a/src/build/browser/html.js b/src/build/browser/html.js
index 5efcad5..cd99928 100644
--- a/src/build/browser/html.js
+++ b/src/build/browser/html.js
@@ -178,6 +178,8 @@ exports.GameHTML = Class(function () {
             var closestIcon;
 
             for (var size in iosIcons) {
+              if (typeof iosIcons[size] != 'string') { continue; }
+
               var intSize = parseInt(size);
               var icon = path.join(app.paths.root, iosIcons[size]);
               if (!fs.existsSync(icon)) {
diff --git a/src/clientapi/native/Window.js b/src/clientapi/native/Window.js
index 7d14409..b124a5a 100644
--- a/src/clientapi/native/Window.js
+++ b/src/clientapi/native/Window.js
@@ -14,24 +14,22 @@
  * along with the Game Closure SDK.  If not, see <http://mozilla.org/MPL/2.0/>.
  */
 
-"use import";
-
 import lib.PubSub;
 
-var _evts = new lib.PubSub();
+module.exports = new lib.PubSub();
 
 window.open = window.open || window.setLocation;
 
 window.addEventListener = function (evtName, cb, isBubble) {
-	_evts.subscribe(evtName, window, cb);
+  module.exports.on(evtName, cb);
 }
 
 window.removeEventListener = function (evtName, cb, isBubble) {
-	_evts.unsubscribe(evtName, window, cb);
+  module.exports.removeListener(evtName, cb);
 }
 
 window.__fireEvent = function (name, evt) {
-	if (!evt) { evt = {}; }
-	evt.type = name;
-	_evts.publish(name, evt);
+  if (!evt) { evt = {}; }
+  evt.type = name;
+  module.exports.publish(name, evt);
 }