- more fixes for CFO