Fix raw ServiceReferences and ServiceRegistrations