fixes to async data