Adjust debug code to use ID not uname