#1 Script fixes