Debug output fixes
2 files changed