pb bug fixes
pb bug fixes