Some more script tweaks