Think I found a way to fix these kinds of problems. We'll see how the Rig workers behave in the next patch, and then maybe I could apply the same fix to put a stop to Core City civil wars (if we even want that at this point, lol?) and similar situations.