Few tweaks here and there