Few minor tweaks.