Fixed some scheduling issues