VID-588 Fixes from code review.