VE-1074 Changes from code review