Fix leader assignments