Fix async load bugs introduced with previous commits.