Add better debug macros
Little fix