Mostly debugger fixes