Followup r105122 & r105123, fixes and improvements per CR