Fix schedule stuff