Few tweaks before PR