Improved timing of Future completion.