Add compatibility with latest ember