Fix 2.5 requirements