Debugger tweaks