[TIDOC-898] Fixes per comments