Fix some asserts and add a flag for Rescheduled