Few tweaks