Added missing uses/checks for the active pif.