Make the fixes 2.6 compatible