VE-888 DEBUG fixes from CR