diff --git a/slave_scripts/devstack-vm-fetch.py b/slave_scripts/devstack-vm-fetch.py
index cc7ee516..68110906 100644
--- a/slave_scripts/devstack-vm-fetch.py
+++ b/slave_scripts/devstack-vm-fetch.py
@@ -26,5 +26,5 @@ node = db.getMachineForUse()
 if not node:
     raise Exception("No ready nodes")
 
-print "NODE_IP_ADDR=%s\n" % node['ip']
-print "NODE_UUID=%s\n" % node['uuid']
+print "NODE_IP_ADDR=%s" % node['ip']
+print "NODE_UUID=%s" % node['uuid']
diff --git a/slave_scripts/vmdatabase.py b/slave_scripts/vmdatabase.py
index 1a4fa02b..9d200330 100644
--- a/slave_scripts/vmdatabase.py
+++ b/slave_scripts/vmdatabase.py
@@ -81,7 +81,7 @@ class VMDatabase(object):
         ret = None
         for m in self.getMachines():
             if m['state']==READY:
-                self.setMachineState(m['id'], USED)
+                self.setMachineState(m['uuid'], USED)
                 ret = m
                 break
         self.conn.execute("commit")