The answer to both questions is a reinitialization of the DFM databases:
NMSROOT/bin/perl NMSROOT/bin/dbRestoreOrig.pl dsn=dfmEpm dmprefix=EPM
NMSROOT/bin/perl NMSROOT/bin/dbRestoreOrig.pl dsn=dfmInv dmprefix=INV
NMSROOT/bin/perl NMSROOT/bin/dbRestoreOrig.pl dsn=dfmFh dmprefix=FH
Then remove NMSROOT/objects/smarts/local/repos/icf/DFM.rps