Fix 2.6 issues