fixes to ember 1.5.0 changes