Improve debug messages