Cosmetic change and bugfix for debugger