More compatability fixes