Debug tools improvement