More Debugger tweaks