Fix 4.9 building