I am not sure it can be fixed because that is just how federation works else the activity pub would have to rewriten from scratch.
I don't see the fork being compatible because that is the reason to fork it in the first place, people not agreeing with what should be federated or not.