Fix Cloudserver (main) + PackageInstaller (mocha)