Fix for phf changes