Some fixes for Schedules