Protobuf version fixes