Last emi message, bug fixes