More fixes for PIFH integration.