More scripts tweaks