Fixing lint error and making emulator killing windows friendly