Improved debugging.