Fixed up async stuff