Fixed couple more issues with schedule handling