more compatibility changes