fixup for the common types.