Update with scheduler bug fixes