Scheduler a few more bug fixes--low pri)