Small fixes and changes after upgrading to Ember 1.7