Fixup things