Fix the rest of the scripts