[Protobuf] Additions \ Fixes