Fixes issues related to emm and store