A few fixes to the scripts.