Compatibility tweaks.