Fixup some more.