Minor updates to fix scripts