more compatibility tweaks