Issue #8: More debug info