Fixed ES scratch/reinstall