debugger fixes