Compatibility and usability fixes