More 2.6, 3+ compatability fixes