None of these are particularly interesting; merely fixing spurious failures noted in the nightly job.