Some more < 2.7 support