(PDB-708) More changes to make new fact schema work

Signed-off-by: Ken Barber <ken@bob.sh>