Improve debug logs