Further debugger work