PFBlockAlgo Fixes from #3385 and #3531

Fixes as given in those PRs, testing took place in 71X.