Fix async issues