Data fixup.