Debugger changes