Final tweaks before pull request