VE-768 Changes from code review