Fixup scripts broken by last commit