more ember 1.4 upgrade work