Fixed some async problems