diff --git a/src/api.js b/src/api.js
index 67bd469be..fc87788bd 100644
--- a/src/api.js
+++ b/src/api.js
@@ -110,7 +110,7 @@ function resolveParams (method, params) {
     // Register this new value.
     params[key] = object
 
-    if (permissions != null) {
+    if (!permissions) {
       permissions.push([ object.id, permission ])
     }
   })
diff --git a/src/api/docker.js b/src/api/docker.js
index 493317cf9..807cd46ba 100644
--- a/src/api/docker.js
+++ b/src/api/docker.js
@@ -1,8 +1,6 @@
 export async function register ({vm}) {
   await this.getXapi(vm).registerDockerContainer(vm._xapiId)
 }
-register.permission = 'admin'
-
 register.description = 'Register the VM for Docker management'
 
 register.params = {
@@ -18,8 +16,6 @@ register.resolve = {
 export async function deregister ({vm}) {
   await this.getXapi(vm).unregisterDockerContainer(vm._xapiId)
 }
-deregister.permission = 'admin'
-
 deregister.description = 'Deregister the VM for Docker management'
 
 deregister.params = {
@@ -53,8 +49,6 @@ export async function unpause ({vm, container}) {
 }
 
 for (let fn of [start, stop, restart, pause, unpause]) {
-  fn.permission = 'admin'
-
   fn.params = {
     vm: { type: 'string' },
     container: { type: 'string' }
diff --git a/src/api/vm.coffee b/src/api/vm.coffee
index 548ee7206..aedd534d6 100644
--- a/src/api/vm.coffee
+++ b/src/api/vm.coffee
@@ -1143,7 +1143,7 @@ createCloudInitConfigDrive.resolve = {
 
   # Not compatible with resource sets.
   # FIXME: find a workaround.
-  sr: [ 'sr', 'SR', null ] # 'operate' ]
+  sr: [ 'sr', 'SR', '' ] # 'operate' ]
 }
 exports.createCloudInitConfigDrive = createCloudInitConfigDrive