VE-821 Tweaks from code review