A few more minor changes to Debugger