Updates to fix PIFH issues.