Update few minor tweaks to work flow.