WIP: Fix up scripts