Fixes to debugger after last merge.