Minor compatibility improvements