Fixes related to countrywise coa