Improve launch debug listener