Minor fixes as a result of merging back with Ember.