Fix schedule issues