Script small changes