Some fixes to run the script