Improve debug support