Continuing e639caa, fix other scripts similarly.