Emi - Bug fixes

Version: 1.4.0.119