Address Yuri's comments on federation fixes.