some fixes to the debugger

Some things were left out from the merge last time. This PR is meant to fix that.