Debugger bug fixes
Minor border tweaks