diff --git a/trunk/daemon/core/mobility.py b/trunk/daemon/core/mobility.py
index 3bbb510f..2e93021b 100644
--- a/trunk/daemon/core/mobility.py
+++ b/trunk/daemon/core/mobility.py
@@ -689,7 +689,7 @@ class WayPointMobility(WirelessModel):
         node.position.set(x, y, z)
         msg = node.tonodemsg(flags=0)
         self.session.broadcastraw(None, msg)
-        self.session.sdt.updatenode(node, flags=0, x=x, y=y, z=z)
+        self.session.sdt.updatenode(node.objid, flags=0, x=x, y=y, z=z)
         
     def setendtime(self):
         ''' Set self.endtime to the time of the last waypoint in the queue of
diff --git a/trunk/daemon/core/sdt.py b/trunk/daemon/core/sdt.py
index fb1c9300..e297d964 100644
--- a/trunk/daemon/core/sdt.py
+++ b/trunk/daemon/core/sdt.py
@@ -331,6 +331,6 @@ class Sdt(object):
                 n = self.session.obj(nodenum)
             except KeyError:
                 return False
-            if isinstance(n, (pycore.nodes.WlanNode, pycore.nodes.EmaneNode)):
+            if isinstance(n, (nodes.WlanNode, nodes.EmaneNode)):
                 return True
         return False