Handle the new output from the hard-link code, including a fix