Schedule fixes