More robust scripts

The script(s) will now fail on CI until all the problems are fixed.