* another attempt to fix the multi-instance conflicts * try to fix windows build * cleanup + improve comment