Small improvements to the CI infrastructure