- more fixes for CFO because there was bugs in the latest implementation