Fixes in scripts