- Changed the -minimized behaviour

- [CFO] added fixes for CFO