Improve debug output