Emulator improvements