protobuf fixes