Fixes for PFS