pfr-0 fixes