Edits to pass code review for UI-G/16 and UI-G/17

Minor edits.