diff --git a/gatchat/gatserver.c b/gatchat/gatserver.c
index e3cbb8f0..50bb4b27 100644
--- a/gatchat/gatserver.c
+++ b/gatchat/gatserver.c
@@ -543,7 +543,7 @@ static void at_f_cb(GAtServer *server, GAtServerRequestType type,
 						G_AT_SERVER_RESULT_ERROR);
 			return;
 		}
-		/* intentional fallback here */
+		/* fall through */
 
 	case G_AT_SERVER_REQUEST_TYPE_COMMAND_ONLY:
 		/* default behavior on AT&F same as ATZ */
diff --git a/gatchat/ppp_ipcp.c b/gatchat/ppp_ipcp.c
index 439ad31b..125a5429 100644
--- a/gatchat/ppp_ipcp.c
+++ b/gatchat/ppp_ipcp.c
@@ -401,9 +401,11 @@ static enum rcr_result ipcp_client_rcr(struct ipcp_data *ipcp,
 				break;
 
 			/*
-			 * Fall through, reject IP_ADDRESS if peer sends
-			 * us 0 (expecting us to provide its IP address)
+			 * Reject IP_ADDRESS if peer sends us 0 (expecting
+			 * us to provide its IP address)
 			 */
+
+			/* fall through */
 		default:
 			if (options == NULL) {
 				guint16 max_len = ntohs(packet->length) - 4;
diff --git a/gatchat/ppp_ipv6cp.c b/gatchat/ppp_ipv6cp.c
index ecfd5702..94feaccd 100644
--- a/gatchat/ppp_ipv6cp.c
+++ b/gatchat/ppp_ipv6cp.c
@@ -189,9 +189,12 @@ static enum rcr_result ipv6cp_client_rcr(struct ipv6cp_data *ipv6cp,
 
 			if (ipv6cp->peer_addr != 0)
 				break;
+
 			/*
-			 * Fall through, reject zero Interface ID
+			 * Reject zero Interface ID
 			 */
+
+			/* fall through */
 		default:
 			if (options == NULL) {
 				guint16 max_len = ntohs(packet->length) - 4;