Fix 8.0 build