More fixes for unwrapping shared_futures