diff --git a/src/diag_log.c b/src/diag_log.c
index e27d0c2..3f09a8b 100644
--- a/src/diag_log.c
+++ b/src/diag_log.c
@@ -126,7 +126,7 @@ void diag_log_enable_all_supported_family(struct diag_instance *di, uint8_t fami
 	}
 
 	rx = diag_transceive_msg(di, msg);
-	if (rx->l2h[0] != 0x53)
+	if (rx->l2h[0] != DIAG_LOG_CONFIG_F)
 		fprintf(stderr, "Error enabling logs for family %d\n", family);
 	/* FIXME: further validation of response */
 	msgb_free(rx);
diff --git a/src/diag_msg.c b/src/diag_msg.c
index 348cf2a..12f1a0a 100644
--- a/src/diag_msg.c
+++ b/src/diag_msg.c
@@ -65,7 +65,7 @@ int diag_msg_config_set_rt_mask(struct diag_instance *di, uint16_t ssid, uint32_
 
 	rx = diag_transceive_msg(di, msg);
 	res = (struct diag_set_rt_mask_req *) (msgb_l2(msg)+1);
-	if ((rx->l2h[0] != 0x5d) || res->cmd_code != 0x5d ||
+	if ((rx->l2h[0] != DIAG_EXT_MSG_CONFIG_F) || res->cmd_code != MSG_EXT_SUBCMD_SET_RT_MASK ||
 	    res->sub_cmd != MSG_EXT_SUBCMD_SET_RT_MASK ||
 	    osmo_load16le(&res->ssid_start) != ssid ||
 	    osmo_load16le(&res->ssid_end) != ssid ||