More fixes for ember-data compat.