Fix up scripts. Still a bit broken :/