Compatibility tweaks