Replaced a few uses of shared_future as compiler workarounds