Fix the CI tools