VE-742 code review fixes