VE-1333 Fixes from CR