diff --git a/src/isdn/dss1.c b/src/isdn/dss1.c
index 1fa3eab..35b3774 100644
--- a/src/isdn/dss1.c
+++ b/src/isdn/dss1.c
@@ -313,7 +313,7 @@ static void metering_unit_timer_cb(void *data)
 	call_t *call = data;
 
 	call->metering_total_units++;
-	osmo_timer_schedule(&call->metering_unit_timer, call->metering_unit_period_decisecs / 10), (call->metering_unit_period_decisecs % 10) * 100000;
+	osmo_timer_schedule(&call->metering_unit_timer, call->metering_unit_period_decisecs / 10, (call->metering_unit_period_decisecs % 10) * 100000);
 	snd_msg_fac_aocd(call);
 }
 
@@ -2215,8 +2215,6 @@ void setup_rsp(call_t *call, uint32_t pid, osmo_cc_msg_t *msg)
 	char connected[33];
 	char display[128];
 	int rc;
-	uint8_t fac_ie[256];
-	struct asn1_parm fac;
 
 	/* NT-MODE in setup state we must send PROCEEDING first */
 	if (!call->proceeding_sent && call->isdn_ep->ntmode) {
@@ -2402,7 +2400,7 @@ void progress_req(call_t *call, uint32_t pid, osmo_cc_msg_t *msg)
 	rc = osmo_cc_get_ie_metering(msg, 0, &(call->metering_connect_units), &(call->metering_unit_period_decisecs));
 	if(rc >= 0) {
 		call->metering_info_received = 1;
-		generate_aocs_fac(call);
+		snd_msg_fac_aocs(call);
 	}
 }
 
diff --git a/src/isdn/isdn.c b/src/isdn/isdn.c
index 45646bf..5f9372f 100644
--- a/src/isdn/isdn.c
+++ b/src/isdn/isdn.c
@@ -853,7 +853,7 @@ void call_destroy(call_t *call)
 	free((char *)call->sdp);
 
 	/* remove metering timer, if still active */
-	osmo_timer_del(&call->aocd_unit_timer);
+	osmo_timer_del(&call->metering_unit_timer);
 
 	/* detach */
 	call_p = &call->isdn_ep->call_list;