Follow up on @havardpe comments.

2 files changed, 3 insertions, 2 deletions

diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
index 55848e32d76..4b4b23a75db 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
@@ -109,7 +109,7 @@ RPCNetwork::RPCNetwork(const RPCNetworkParams &params) :
     _ident(params.getIdentity()),
     _threadPool(std::make_unique<FastOS_ThreadPool>(128000, 0)),
     _transport(std::make_unique<FNET_Transport>()),
-    _orb(std::make_unique<FRT_Supervisor>(_transport.get(), _threadPool.get())),
+    _orb(std::make_unique<FRT_Supervisor>(_transport.get(), nullptr)),
     _scheduler(*_transport->GetScheduler()),
     _targetPool(std::make_unique<RPCTargetPool>(params.getConnectionExpireSecs())),
     _targetPoolTask(_scheduler, *_targetPool),
diff --git a/messagebus/src/vespa/messagebus/network/rpcsend.cpp b/messagebus/src/vespa/messagebus/network/rpcsend.cpp
index 56c23997c4c..705b8648442 100644
--- a/messagebus/src/vespa/messagebus/network/rpcsend.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcsend.cpp
@@ -41,7 +41,8 @@ class FillByHandover final : public PayLoadFiller
 public:
     FillByHandover(Blob payload) : _payload(std::move(payload)) { }
     void fill(FRT_Values & v) const override {
-        v.AddData(std::move(_payload.payload()), _payload.size());
+        size_t sz = _payload.size();
+        v.AddData(std::move(_payload.payload()), sz);
     }
     void fill(const vespalib::Memory & name, vespalib::slime::Cursor & v) const override {
         v.setData(name, vespalib::Memory(_payload.data(), _payload.size()));