VE-742 Changes from code review