Fix some async callback issues