Fixup (mostly)