fixes for ember
PR comments fixes
oops