Fix breaks on IPFA