diff --git a/framework/core/ember/app/initializers/preload-data.js b/framework/core/ember/app/initializers/preload-data.js
index 75cd4f920..5c18048d6 100644
--- a/framework/core/ember/app/initializers/preload-data.js
+++ b/framework/core/ember/app/initializers/preload-data.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 export default {
   name: 'preload-data',
-  after: 'store',
+  after: 'ember-data',
   initialize: function(container) {
     var store = container.lookup('store:main');
     if (!Ember.isEmpty(FLARUM_DATA)) {
@@ -11,9 +11,9 @@ export default {
     if (!Ember.isEmpty(FLARUM_SESSION)) {
       FLARUM_SESSION.user = store.getById('user', FLARUM_SESSION.userId);
       container.lookup('simple-auth-session:main').setProperties({
-          isAuthenticated: true,
-          authenticator: 'authenticator:flarum',
-          content: FLARUM_SESSION
+        isAuthenticated: true,
+        authenticator: 'authenticator:flarum',
+        content: FLARUM_SESSION
       });
     }
   }
diff --git a/framework/core/ember/app/serializers/application.js b/framework/core/ember/app/serializers/application.js
index c7e93874f..81deb0401 100644
--- a/framework/core/ember/app/serializers/application.js
+++ b/framework/core/ember/app/serializers/application.js
@@ -1,4 +1,5 @@
 import JsonApiSerializer from 'ember-json-api/json-api-serializer';
 
 export default JsonApiSerializer.extend({
+  store: Ember.inject.service()
 });
diff --git a/framework/core/ember/bower.json b/framework/core/ember/bower.json
index c4a835b35..55ad66498 100644
--- a/framework/core/ember/bower.json
+++ b/framework/core/ember/bower.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "jquery": "2.1.3",
     "ember": "1.11.0-beta.3",
-    "ember-data": "1.0.0-beta.15",
+    "ember-data": "1.0.0-beta.16.1",
     "ember-resolver": "~0.1.11",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
diff --git a/framework/core/ember/package.json b/framework/core/ember/package.json
index d92cfda55..908097f83 100644
--- a/framework/core/ember/package.json
+++ b/framework/core/ember/package.json
@@ -30,8 +30,7 @@
     "ember-cli-qunit": "^0.3.8",
     "ember-cli-simple-auth": "^0.7.2",
     "ember-cli-uglify": "1.0.1",
-    "ember-data": "1.0.0-beta.15",
-    "ember-dynamic-component": "0.0.4",
+    "ember-data": "1.0.0-beta.16.1",
     "ember-export-application-global": "^1.0.2",
     "ember-json-api": "eneuhauser/ember-json-api",
     "broccoli-ember-inline-template-compiler": "tobscure/broccoli-ember-inline-template-compiler#f884d11",