[FOLD] Load of bug fixes to peerfinder