Respect includeCoordinator flag when scheduling randomly
Fix issues raised in comments