- [CFO] More fixes for admin operations