More Org agenda adjustments