Fix/update scripts for 1.15