Fixed remaining async problems.