More fixes for coa separate