pkgdb2 fixes like we did for fmn.