Align with HV-VES startup changes