diff --git a/contracts/interfaces/ISocket.sol b/contracts/interfaces/ISocket.sol
index 58fa8dab..8b05b875 100644
--- a/contracts/interfaces/ISocket.sol
+++ b/contracts/interfaces/ISocket.sol
@@ -42,6 +42,7 @@ interface ISocket {
      */
     event AppGatewayCallRequested(
         bytes32 triggerId,
+        bytes32 appGatewayId,
         address switchboard,
         address plug,
         bytes overrides,
diff --git a/contracts/protocol/payload-delivery/FeesManager.sol b/contracts/protocol/payload-delivery/FeesManager.sol
index b2e5b75e..22a6f70b 100644
--- a/contracts/protocol/payload-delivery/FeesManager.sol
+++ b/contracts/protocol/payload-delivery/FeesManager.sol
@@ -179,15 +179,7 @@ contract FeesManager is FeesManagerStorage, Initializable, Ownable, AddressResol
 
         // check signature
         bytes32 digest = keccak256(
-            abi.encode(
-                depositTo_,
-                chainSlug_,
-                token_,
-                amount,
-                address(this),
-                evmxSlug,
-                signatureNonce_
-            )
+            abi.encode(depositTo_, chainSlug_, token_, amount, address(this), evmxSlug)
         );
 
         if (_recoverSigner(digest, signature_) != owner()) revert InvalidWatcherSignature();
diff --git a/contracts/protocol/socket/Socket.sol b/contracts/protocol/socket/Socket.sol
index 5564153b..16852906 100644
--- a/contracts/protocol/socket/Socket.sol
+++ b/contracts/protocol/socket/Socket.sol
@@ -190,6 +190,7 @@ contract Socket is SocketUtils {
         triggerId = _encodeTriggerId();
         emit AppGatewayCallRequested(
             triggerId,
+            plugConfig.appGatewayId,
             plugConfig.switchboard,
             plug_,
             // gets the overrides from the plug
diff --git a/contracts/protocol/utils/common/Structs.sol b/contracts/protocol/utils/common/Structs.sol
index 2b9f3838..e65db7ae 100644
--- a/contracts/protocol/utils/common/Structs.sol
+++ b/contracts/protocol/utils/common/Structs.sol
@@ -95,7 +95,7 @@ struct PlugConfig {
 //trigger:
 struct TriggerParams {
     bytes32 triggerId;
-    bytes32 params;
+    bytes32 overrides;
     address plug;
     bytes32 appGatewayId;
     uint32 chainSlug;
diff --git a/src/enums.ts b/src/enums.ts
index 87a79cd5..689543ce 100644
--- a/src/enums.ts
+++ b/src/enums.ts
@@ -11,6 +11,7 @@ export enum Events {
   ExecutionFailed = "ExecutionFailed",
   PlugConnected = "PlugConnected",
   AppGatewayCallRequested = "AppGatewayCallRequested",
+  AppGatewayCallFailed = "AppGatewayCallFailed",
 
   // FeesPlug
   FeesDeposited = "FeesDeposited",
diff --git a/src/events.ts b/src/events.ts
index 1893f5b0..b12fa610 100644
--- a/src/events.ts
+++ b/src/events.ts
@@ -11,6 +11,7 @@ export const feesPlugEvents = [Events.FeesDeposited];
 
 export const watcherPrecompileEvents = [
   Events.CalledAppGateway,
+  Events.AppGatewayCallFailed,
   Events.RequestSubmitted,
   Events.QueryRequested,
   Events.FinalizeRequested,
diff --git a/test/DeliveryHelper.t.sol b/test/DeliveryHelper.t.sol
index e1dc4574..85d4b42b 100644
--- a/test/DeliveryHelper.t.sol
+++ b/test/DeliveryHelper.t.sol
@@ -200,8 +200,7 @@ contract DeliveryHelperTest is SetupTest {
                 fees_.token,
                 fees_.amount,
                 address(feesManager),
-                evmxSlug,
-                signatureNonce
+                evmxSlug
             )
         );
 
diff --git a/test/Inbox.t.sol b/test/Inbox.t.sol
index 45caa25f..f680f6de 100644
--- a/test/Inbox.t.sol
+++ b/test/Inbox.t.sol
@@ -12,6 +12,7 @@ contract TriggerTest is DeliveryHelperTest {
 
     event AppGatewayCallRequested(
         bytes32 triggerId,
+        bytes32 appGatewayId,
         address switchboard,
         address plug,
         bytes overrides,
@@ -78,6 +79,7 @@ contract TriggerTest is DeliveryHelperTest {
         vm.expectEmit(true, true, true, true);
         emit AppGatewayCallRequested(
             triggerId,
+            _encodeAppGatewayId(address(gateway)),
             address(arbConfig.switchboard),
             address(counter),
             bytes(""),
@@ -92,7 +94,7 @@ contract TriggerTest is DeliveryHelperTest {
             appGatewayId: _encodeAppGatewayId(address(gateway)),
             plug: address(counter),
             payload: payload,
-            params: bytes32(0)
+            overrides: bytes32(0)
         });
 
         bytes memory watcherSignature = _createWatcherSignature(
diff --git a/test/mock/MockSocket.sol b/test/mock/MockSocket.sol
index b4e0f483..6a86473a 100644
--- a/test/mock/MockSocket.sol
+++ b/test/mock/MockSocket.sol
@@ -96,6 +96,7 @@ contract MockSocket is ISocket {
         triggerId = _encodeTriggerId(plugConfig.appGatewayId);
         emit AppGatewayCallRequested(
             triggerId,
+            plugConfig.appGatewayId,
             address(plugConfig.switchboard__),
             msg.sender,
             overrides,