Minor compatibility updates.