Fix 2.10 build