Last tweaks before release of 5.0.0