Few changes to make it compatible with ember 1.8