Improved debugging tools