diff --git a/clock.c b/clock.c
index c99812b..c3baa87 100644
--- a/clock.c
+++ b/clock.c
@@ -997,20 +997,20 @@ void clock_path_delay(struct clock *c, struct timespec req, struct timestamp rx,
 	pd = tmv_div(pd, 2);
 
 	if (pd < 0) {
-		pr_debug("negative path delay %10lld", pd);
+		pr_debug("negative path delay %10" PRId64, pd);
 		pr_debug("path_delay = (t2 - t3) + (t4 - t1) - (c1 + c2 + c3)");
-		pr_debug("t2 - t3 = %+10lld", t2 - t3);
-		pr_debug("t4 - t1 = %+10lld", t4 - t1);
-		pr_debug("c1 %10lld", c1);
-		pr_debug("c2 %10lld", c2);
-		pr_debug("c3 %10lld", c3);
+		pr_debug("t2 - t3 = %+10" PRId64, t2 - t3);
+		pr_debug("t4 - t1 = %+10" PRId64, t4 - t1);
+		pr_debug("c1 %10" PRId64, c1);
+		pr_debug("c2 %10" PRId64, c2);
+		pr_debug("c3 %10" PRId64, c3);
 	}
 
 	c->path_delay = filter_sample(c->delay_filter, pd);
 
 	c->cur.meanPathDelay = tmv_to_TimeInterval(c->path_delay);
 
-	pr_debug("path delay    %10lld %10lld", c->path_delay, pd);
+	pr_debug("path delay    %10" PRId64 " %10" PRId64, c->path_delay, pd);
 
 	if (c->stats.delay)
 		stats_add_value(c->stats.delay, tmv_to_nanoseconds(pd));
diff --git a/clockadj.c b/clockadj.c
index e0e82f0..fbf9423 100644
--- a/clockadj.c
+++ b/clockadj.c
@@ -125,7 +125,7 @@ void sysclk_set_leap(int leap)
 	if (clock_adjtime(clkid, &tx) < 0)
 		pr_err("failed to set the clock status: %m");
 	else if (m)
-		pr_notice(m);
+		pr_notice("%s", m);
 	realtime_leap_bit = tx.status;
 }
 
diff --git a/port.c b/port.c
index 81556ae..523970e 100644
--- a/port.c
+++ b/port.c
@@ -468,8 +468,8 @@ static int port_capable(struct port *p)
 
 	if (tmv_to_nanoseconds(p->peer_delay) >	p->neighborPropDelayThresh) {
 		if (p->asCapable)
-			pr_debug("port %hu: peer_delay (%lld) > neighborPropDelayThresh "
-				"(%lld), resetting asCapable", portnum(p),
+			pr_debug("port %hu: peer_delay (%" PRId64 ") > neighborPropDelayThresh "
+				"(%" PRId32 "), resetting asCapable", portnum(p),
 				tmv_to_nanoseconds(p->peer_delay),
 				p->neighborPropDelayThresh);
 		goto not_capable;
@@ -1791,7 +1791,7 @@ calc:
 
 	p->peerMeanPathDelay = tmv_to_TimeInterval(p->peer_delay);
 
-	pr_debug("pdelay %hu   %10lld %10lld", portnum(p), p->peer_delay, pd);
+	pr_debug("pdelay %hu   %10" PRId64 "%10" PRId64, portnum(p), p->peer_delay, pd);
 
 	if (p->pod.follow_up_info)
 		port_nrate_calculate(p, t3, t4, tmv_add(c1, c2));