Fixed issues with ember-data