Fixes to persistence async code.