More script tweaks.