VE-969 Changes from code review