Update using FoundationDB versions of these. Missed when built package