Few minor tweaks

Few minor tweaks