Minor compatibility changes