Couple more compatibility changes.