Few more tweaks here and there