Fixed debugging tools