Edits from review

stud-1332