Some updates in the scripts