A couple of tweaks to try and get the main CI env working more reliably.