VE-1564 Fixes from code review