Fixed some async problems.