Emulation mode bug fixes and threshold