[Misc] Various debug changes