VE-1564 Changes from code review