MODE-1733 Additional corrections and changes, per the code review