Script tweaks