Index: trunk/packages/invirt-web/code/controls.py
===================================================================
--- trunk/packages/invirt-web/code/controls.py	(revision 1615)
+++ trunk/packages/invirt-web/code/controls.py	(revision 1618)
@@ -25,7 +25,7 @@
 
 def remctl(*args, **kwargs):
-    return gen_remctl(config.remote.hostname, *args,
+    return gen_remctl(config.remote.hostname,
                       principal='daemon/'+config.web.hostname,
-                      **kwargs)
+                      *args, **kwargs)
 
 def lvcreate(machine, disk):
Index: trunk/packages/invirt-web/code/main.py
===================================================================
--- trunk/packages/invirt-web/code/main.py	(revision 1615)
+++ trunk/packages/invirt-web/code/main.py	(revision 1618)
@@ -247,5 +247,5 @@
     machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
 
-    token = control.vnctoken(machine)
+    token = controls.vnctoken(machine)
     host = controls.listHost(machine)
     if host: