PFD fixes