Fix duplicate service instance ids