Some compatibility tweaks