Fixes in script