asynchronous fixes