VE-1024: Changes from code review