Fix 363299ac failures