Add more debug info to #818 debugger