Last tweaks before pull request