Fixes to the PIF