[Debugger] fixups to previous commit