Just a few more CI/nightly things then done.