Few tweaks to merge to master