Fix few things in the script