Debugger fixes