more ember data upgrade fixes