Minor tweaks before release