cashflow and jo fixes