comparability fixes