Fixes for deferred futures