Tweaked how the market source overrides are saved so things happen in the right order.