fixes from vCPE testing