Schedule, other fixes