Fixup all the things!