Fixup all sorts of junk.