VE-1677 Fixes from CR comments