Scripts minor changes