diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 2173e12..135849e 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2681,16 +2681,16 @@ Private.event_prototypes = {
 
       if trigger.powertype == 4 then
         local _, class = UnitClass("player")
-        AddUnitEventForEvents(result, unit, "UNIT_COMBO_POINTS")
-        AddUnitEventForEvents(result, unit, "UNIT_TARGET")
+        result.events = result.events or {}
+        tinsert(result.events, "UNIT_COMBO_POINTS")
+        AddUnitEventForEvents(result, 'player', "UNIT_TARGET")
+        AddUnitEventForEvents(result, 'vehicle', "UNIT_TARGET")
         if class == "DRUID" then
           AddUnitEventForEvents(result, unit, "UNIT_MODEL_CHANGED")
         end
       -- For units not in multiUnitUnits, add FRAME_UPDATE to ensure smooth power updates
       elseif unit and not Private.multiUnitUnits[unit] then
-        if not result.events then
-          result.events = {}
-        end
+        result.events = result.events or {}
         tinsert(result.events, "FRAME_UPDATE")
       else
         AddUnitEventForPowerEvents(result, unit, powerType)
diff --git a/WeakAurasOptions/OptionsFrames/Update.lua b/WeakAurasOptions/OptionsFrames/Update.lua
index ac6eba9..5ae82ce 100644
--- a/WeakAurasOptions/OptionsFrames/Update.lua
+++ b/WeakAurasOptions/OptionsFrames/Update.lua
@@ -247,8 +247,10 @@ local function DebugPrintDiff(diff, id, uid)
 end
 
 local function Diff(ours, theirs)
-  local ignored = WeakAuras.Mixin({}, OptionsPrivate.Private.internal_fields,
-                                  OptionsPrivate.Private.non_transmissable_fields)
+  local ignored = WeakAuras.Mixin({},
+    OptionsPrivate.Private.internal_fields,
+    OptionsPrivate.Private.non_transmissable_fields
+  )
 
   -- generates a diff which WeakAuras.Update can use
   local debug = false