Bug fixes in the Scripts section