Some fixes for Debugger