Fix up scope
Wait for listen to complete