Fix 5.4/5.5 build