Do some fixup to be more compatible, clean up links.