Last tweaks before cutting over v2.1