More script tweaks