VE-888 Fixes from CR