Small changes to get us ready for CI