Improve debug utils as per @michaelklishin ocmment