More compatibility tweaks