compability fixes