Performance, compatibility enhancements