More fixes for upgrades from older IPPF releases.