Fix 8.04 build