Various Fixes to Debugger