Emi - Various bug fixes (noon)