Fixing the CI build