Final tweaks before branch