Fix service_mapping paths