Fixes for async dispatch