Some fixes in run scripts