Improve debugging experience