Improve debug informations