Fix 1.9 broken builds