Fixup of database mapping.