Other fixes to schedule management.