Fix create_cmd to handle emulator also