Some minor cleanup in the coordinator