Fixed changes to emulator