Try to fix some scheduling issues