Fix service class and end anchor relationship.