scheduler: fixes on re-scheduling and circuit relasing