Applying old fixes for ember.js