Minor fixes in scripts