Few minor tweaks