Updates to debugger