diff --git a/qubes/app.py b/qubes/app.py
index e7b06a77..d5012664 100644
--- a/qubes/app.py
+++ b/qubes/app.py
@@ -994,4 +994,4 @@ class Qubes(qubes.PropertyHolder):
             if vm.provides_network and vm.property_is_default('netvm'):
                 # fire property-del:netvm as it is responsible for resetting
                 # netvm to it's default value
-                vm.fire_event('property-del:netvm', 'netvm', newvalue, oldvalue)
+                vm.fire_event('property-del:netvm', 'netvm', oldvalue)
diff --git a/qubes/vm/mix/net.py b/qubes/vm/mix/net.py
index f0899d29..91595e8a 100644
--- a/qubes/vm/mix/net.py
+++ b/qubes/vm/mix/net.py
@@ -180,7 +180,7 @@ class NetVMMixin(qubes.events.Emitter):
 
 
     @qubes.events.handler('domain-pre-shutdown')
-    def shutdown_net(self, force=False):
+    def shutdown_net(self, event, force=False):
         connected_vms = [vm for vm in self.connected_vms if vm.is_running()]
         if connected_vms and not force:
             raise qubes.exc.QubesVMError(
@@ -272,7 +272,7 @@ class NetVMMixin(qubes.events.Emitter):
         pass
 
     @qubes.events.handler('property-del:netvm')
-    def on_property_del_netvm(self, event, name, old_netvm):
+    def on_property_del_netvm(self, event, prop, old_netvm=None):
         # pylint: disable=unused-argument
         # we are changing to default netvm
         new_netvm = self.netvm
diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
index fc6aac0b..0d46c5c1 100644
--- a/qubes/vm/qubesvm.py
+++ b/qubes/vm/qubesvm.py
@@ -597,7 +597,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
             self.autostart = self.autostart
 
     @qubes.events.handler('property-pre-set:autostart')
-    def on_property_pre_set_autostart(self, event, prop, name, value,
+    def on_property_pre_set_autostart(self, event, prop, value,
             oldvalue=None):
         # pylint: disable=unused-argument
         if subprocess.call(['sudo', 'systemctl',