Emi - Bugs Fixed