CLC-2420 More script tweaks as suggested by Darlene