Some tiny fixes in Debugger