Fixing CI builds