diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c
index a4c20856..21251e31 100644
--- a/proto/aggregator/aggregator.c
+++ b/proto/aggregator/aggregator.c
@@ -923,7 +923,7 @@ run_aggregation(struct aggregator_proto *p)
 static void
 aggregate_on_feed_end(struct channel *C)
 {
-  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, C);
+  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, C->proto);
 
   /* Run aggregation only on feed end from the source channel */
   if (C == p->src)
@@ -931,9 +931,9 @@ aggregate_on_feed_end(struct channel *C)
 }
 
 static void
-aggregate_on_settle_timer(struct settle *timer)
+aggregate_on_settle_timer(struct settle *s)
 {
-  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, timer);
+  struct aggregator_proto *p = SKIP_BACK(struct aggregator_proto, p, s->tm.data);
   run_aggregation(p);
 }