Re-applied a few lost fixes on debugger pane