diff --git a/mxm_wifiex/wlan_src/Makefile b/mxm_wifiex/wlan_src/Makefile
index b4dcc3c..ab791cd 100644
--- a/mxm_wifiex/wlan_src/Makefile
+++ b/mxm_wifiex/wlan_src/Makefile
@@ -659,7 +659,7 @@ appsbuild:
 		mkdir $(BINDIR); \
 	fi
 
-	cp -f README_MLAN $(BINDIR)
+	cp -f README $(BINDIR)
 
 ifneq ($(APPDIR),)
 	cp -rf mapp/mlanconfig/config $(BINDIR)
@@ -678,7 +678,7 @@ build:		echo default
 	cp -rpf script/load $(BINDIR)/
 	cp -rpf script/unload $(BINDIR)/
 
-	cp -f README_MLAN $(BINDIR)
+	cp -f README $(BINDIR)
 
 ifneq ($(APPDIR),)
 	cp -rf mapp/mlanconfig/config $(BINDIR)
diff --git a/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.c b/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.c
index 3a01621..aa31346 100644
--- a/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.c
+++ b/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.c
@@ -4348,9 +4348,9 @@ static int woal_cfg80211_subcmd_rtt_range_request(struct wiphy *wiphy,
 	}
 	if (nla_len(tb[ATTR_RTT_TARGET_CONFIG]) !=
 	    sizeof(rtt_params.rtt_config[0]) * rtt_config_num) {
-		PRINTM(MERROR, "%s: invalid %d(total) != %d(num) * %lu(each)\n",
+		PRINTM(MERROR, "%s: invalid %d(total) != %d(num) * %u(each)\n",
 		       __func__, nla_len(tb[ATTR_RTT_TARGET_CONFIG]),
-		       rtt_config_num, sizeof(rtt_params.rtt_config[0]));
+		       rtt_config_num, (t_u32)sizeof(rtt_params.rtt_config[0]));
 		err = -EINVAL;
 		goto done;
 	}
@@ -4463,9 +4463,9 @@ static int woal_cfg80211_subcmd_rtt_range_cancel(struct wiphy *wiphy,
 	if ((target_num <= 0 || target_num > MAX_RTT_CONFIG_NUM) ||
 	    (nla_len(tb[ATTR_RTT_TARGET_ADDR]) !=
 	     sizeof(t_u8) * MLAN_MAC_ADDR_LENGTH * target_num)) {
-		PRINTM(MERROR, "%s: Check if %din[1-%d] or %d*%lu=%d\n",
+		PRINTM(MERROR, "%s: Check if %din[1-%d] or %d*%u=%d\n",
 		       __func__, target_num, MAX_RTT_CONFIG_NUM, target_num,
-		       sizeof(t_u8) * MLAN_MAC_ADDR_LENGTH,
+		       (t_u32)(sizeof(t_u8) * MLAN_MAC_ADDR_LENGTH),
 		       nla_len(tb[ATTR_RTT_TARGET_ADDR]));
 		err = -EINVAL;
 		goto done;
diff --git a/mxm_wifiex/wlan_src/mlinux/moal_init.c b/mxm_wifiex/wlan_src/mlinux/moal_init.c
index 71b087f..0ce0adb 100644
--- a/mxm_wifiex/wlan_src/mlinux/moal_init.c
+++ b/mxm_wifiex/wlan_src/mlinux/moal_init.c
@@ -553,7 +553,7 @@ static mlan_status parse_line_read_card_info(t_u8 *line, char **type,
 	*p = '\0';
 
 	p = strstr(line, "_");
-	if ((p != NULL) && ((p + 1) != NULL)) {
+	if (p != NULL) {
 		*p++ = '\0';
 		*if_id = p;
 	} else {