issue #2771: Fix CI compile errors.