MODE-1818 Minor corrections per code review