Fixes to change coordinators.