Fixes for the 2pffa rules, for the active version