Fixup types