Few more minor tweaks.