diff --git a/repos/os/src/server/nic_bridge/component.cc b/repos/os/src/server/nic_bridge/component.cc
index 015d914bd9..153a5bc08f 100644
--- a/repos/os/src/server/nic_bridge/component.cc
+++ b/repos/os/src/server/nic_bridge/component.cc
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Genode Labs GmbH
+ * Copyright (C) 2010-2017 Genode Labs GmbH
  *
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU General Public License version 2.
@@ -118,7 +118,8 @@ Session_component::Session_component(Genode::Ram_session        &ram,
                                      char                       *ip_addr)
 : Stream_allocator(ram, rm, amount),
   Stream_dataspaces(ram, tx_buf_size, rx_buf_size),
-  Session_rpc_object(Stream_dataspaces::tx_ds,
+  Session_rpc_object(rm,
+                     Stream_dataspaces::tx_ds,
                      Stream_dataspaces::rx_ds,
                      Stream_allocator::range_allocator(), ep.rpc_ep()),
   Packet_handler(ep, nic.vlan()),
diff --git a/repos/os/src/server/nic_bridge/main.cc b/repos/os/src/server/nic_bridge/main.cc
index 00ba9eb6d6..7f53328fea 100644
--- a/repos/os/src/server/nic_bridge/main.cc
+++ b/repos/os/src/server/nic_bridge/main.cc
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2010-2016 Genode Labs GmbH
+ * Copyright (C) 2010-2017 Genode Labs GmbH
  *
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU General Public License version 2.
@@ -32,7 +32,7 @@ struct Main
 	Genode::Heap                    heap   { env.ram(), env.rm() };
 	Genode::Attached_rom_dataspace  config { env, "config" };
 	Net::Vlan                       vlan;
-	Net::Nic                        nic    { ep, heap, vlan };
+	Net::Nic                        nic    { env, heap, vlan };
 	Net::Root                       root   { env, nic, heap, config.xml() };
 
 	void handle_config()
diff --git a/repos/os/src/server/nic_bridge/nic.cc b/repos/os/src/server/nic_bridge/nic.cc
index a7ceab1b3b..623d2f4df9 100644
--- a/repos/os/src/server/nic_bridge/nic.cc
+++ b/repos/os/src/server/nic_bridge/nic.cc
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2013 Genode Labs GmbH
+ * Copyright (C) 2013-2017 Genode Labs GmbH
  *
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU General Public License version 2.
@@ -121,10 +121,10 @@ bool Net::Nic::handle_ip(Ethernet_frame *eth, Genode::size_t size) {
 }
 
 
-Net::Nic::Nic(Genode::Entrypoint &ep, Genode::Heap &heap, Net::Vlan &vlan)
-: Packet_handler(ep, vlan),
+Net::Nic::Nic(Genode::Env &env, Genode::Heap &heap, Net::Vlan &vlan)
+: Packet_handler(env.ep(), vlan),
   _tx_block_alloc(&heap),
-  _nic(&_tx_block_alloc, BUF_SIZE, BUF_SIZE),
+  _nic(env, &_tx_block_alloc, BUF_SIZE, BUF_SIZE),
   _mac(_nic.mac_address().addr)
 {
 	_nic.rx_channel()->sigh_ready_to_ack(_sink_ack);
diff --git a/repos/os/src/server/nic_bridge/nic.h b/repos/os/src/server/nic_bridge/nic.h
index 02fc068c8c..10d4039400 100644
--- a/repos/os/src/server/nic_bridge/nic.h
+++ b/repos/os/src/server/nic_bridge/nic.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2010-2013 Genode Labs GmbH
+ * Copyright (C) 2010-2017 Genode Labs GmbH
  *
  * This file is part of the Genode OS framework, which is distributed
  * under the terms of the GNU General Public License version 2.
@@ -37,7 +37,7 @@ class Net::Nic : public Net::Packet_handler
 
 	public:
 
-		Nic(Genode::Entrypoint&, Genode::Heap&, Vlan&);
+		Nic(Genode::Env&, Genode::Heap&, Vlan&);
 
 		::Nic::Connection          *nic() { return &_nic; }
 		Mac_address mac() { return _mac; }