Large batch of script changes with minor set xml changes