Applying feedback on the update scripts