Touch up debug code