Create emulator bug fixes