Some debugger cleanup