Fixed some async issues.