Minor updates to scripts