Debug: improve debug