Fix pficommon