Fixed async transaction issues (hopefully)