more fpf fixes.