Fixing script calls