[PB] {other} Some fixes