Attempt to fix deferred async tasks