Edits from review

STUD-1347