VE-1333 fixes from CR comment
VE-1333 fixes from CR comment