[TIDOC-877] Fixes per comments