Minor changes to the scripts