Fixed scheduling issues