Fixes for async scheduler