Fixed some bugs into the ClientInstaller batch