Fixes to schedule