Finish the xfpt fix.