Fix some errors with async instantiation