backwards compatability fixes