More logging
Fix run_until_complete