diff --git a/src/devices/csma/csma-net-device.cc b/src/devices/csma/csma-net-device.cc
index cadcf3203..d6b9694e9 100644
--- a/src/devices/csma/csma-net-device.cc
+++ b/src/devices/csma/csma-net-device.cc
@@ -37,6 +37,8 @@ NS_LOG_COMPONENT_DEFINE ("CsmaNetDevice");
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice);
+
 TypeId 
 CsmaNetDevice::GetTypeId (void)
 {
diff --git a/src/internet-node/ipv4-l4-protocol.cc b/src/internet-node/ipv4-l4-protocol.cc
index 02195b616..22e11c704 100644
--- a/src/internet-node/ipv4-l4-protocol.cc
+++ b/src/internet-node/ipv4-l4-protocol.cc
@@ -27,6 +27,8 @@
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (Ipv4L4Protocol);
+
 TypeId 
 Ipv4L4Protocol::GetTypeId (void)
 {
diff --git a/src/internet-node/tcp-l4-protocol.cc b/src/internet-node/tcp-l4-protocol.cc
index 71f421372..34b22f5f0 100644
--- a/src/internet-node/tcp-l4-protocol.cc
+++ b/src/internet-node/tcp-l4-protocol.cc
@@ -41,6 +41,8 @@ NS_LOG_COMPONENT_DEFINE ("TcpL4Protocol");
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (TcpL4Protocol);
+
 //State Machine things --------------------------------------------------------
 TcpStateMachine::TcpStateMachine() 
   : aT (LAST_STATE, StateActionVec_t(LAST_EVENT)),
diff --git a/src/internet-node/udp-l4-protocol.cc b/src/internet-node/udp-l4-protocol.cc
index f2853a6e8..dd6f994ed 100644
--- a/src/internet-node/udp-l4-protocol.cc
+++ b/src/internet-node/udp-l4-protocol.cc
@@ -35,6 +35,8 @@ NS_LOG_COMPONENT_DEFINE ("UdpL4Protocol");
 
 namespace ns3 {
 
+NS_OBJECT_ENSURE_REGISTERED (UdpL4Protocol);
+
 /* see http://www.iana.org/assignments/protocol-numbers */
 const uint8_t UdpL4Protocol::PROT_NUMBER = 17;
 
diff --git a/src/internet-node/udp-socket.cc b/src/internet-node/udp-socket.cc
index 6634f33ee..dfdceb9c0 100644
--- a/src/internet-node/udp-socket.cc
+++ b/src/internet-node/udp-socket.cc
@@ -388,7 +388,9 @@ UdpSocketTest::RunTests (void)
   
   // Receiver Node
   Ptr<Node> rxNode = CreateObject<InternetNode> ();
-  Ptr<PointToPointNetDevice> rxDev = CreateObject<PointToPointNetDevice> (rxNode, Mac48Address::Allocate ());
+  Ptr<PointToPointNetDevice> rxDev = 
+    CreateObjectWith<PointToPointNetDevice> ("Node", rxNode, 
+                                             "Address", Mac48Address::Allocate ());
   rxNode->AddDevice (rxDev);
   rxDev->AddQueue(CreateObject<DropTailQueue> ());
   Ptr<Ipv4> ipv4 = rxNode->GetObject<Ipv4> ();
@@ -399,7 +401,9 @@ UdpSocketTest::RunTests (void)
 
   // Sender Node
   Ptr<Node> txNode = CreateObject<InternetNode> ();
-  Ptr<PointToPointNetDevice> txDev = CreateObject<PointToPointNetDevice> (txNode, Mac48Address::Allocate ());
+  Ptr<PointToPointNetDevice> txDev = 
+    CreateObjectWith<PointToPointNetDevice> ("Node", txNode, 
+                                             "Address", Mac48Address::Allocate ());
   txNode->AddDevice (txDev);
   txDev->AddQueue(CreateObject<DropTailQueue> ());
   ipv4 = txNode->GetObject<Ipv4> ();