Fix services when used now in EAP