Script fixes #2