emu - Various bug fixed