Fix 1.9 exclusive failures