More fixes to work on the CI tool