VE-893: Changes from code review