more ember-cli fixes