Fixup schedule some more