diff --git a/src/mod/say/mod_say_ja/mod_say_ja.c b/src/mod/say/mod_say_ja/mod_say_ja.c
index 72c7c38131..d8e0692fd0 100644
--- a/src/mod/say/mod_say_ja/mod_say_ja.c
+++ b/src/mod/say/mod_say_ja/mod_say_ja.c
@@ -367,7 +367,8 @@ static switch_status_t ja_say_time(switch_core_session_t *session, char *tosay,
 			say_file("time/pm.wav");
 		}
 		say_file("time/hour-%d.wav", tm.tm_hour);
-		if (tm.tm_min > 10) {
+		/* tm_min is always < 60 - this is just to silence gcc 8 warning */
+		if (tm.tm_min > 10 && tm.tm_min < 60) {
 	    		int temp;
                 	char tch[1+1];
                 	mod_min = tm.tm_min % 10;
diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 48861b1e3d..10df7fbc9e 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -11918,7 +11918,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
 			strncpy(q, p, 7);
 			p += 7;
 			q += 7;
-			strncpy(q, strchr(a_engine->adv_sdp_ip, ':') ? "6 " : "4 ", 2);
+			memcpy(q, strchr(a_engine->adv_sdp_ip, ':') ? "6 " : "4 ", 2);
 			p +=2;
 			q +=2;
 			strncpy(q, a_engine->adv_sdp_ip, strlen(a_engine->adv_sdp_ip));