Updated debug macros