Fix 0.8 build