Improve debug information.