Fixing wrong script calls