diff --git a/src/include/switch.h b/src/include/switch.h
index 84019a77e5..f0f91c90e4 100644
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -59,7 +59,11 @@
 #include <setjmp.h>
 #include <ctype.h>
 #include <fcntl.h>
+#ifdef _MSC_VER
+#include <string.h>
+#else
 #include <strings.h>
+#endif
 #include <sys/stat.h>
 #include <limits.h>
 #include <sys/types.h>
diff --git a/src/switch_core.c b/src/switch_core.c
index 2d965d52d2..f6447ddf8a 100644
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -447,10 +447,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err
 					switch_core_session_limit(atoi(val));
 				}
 				else if (!strcasecmp(var, "rtp-start-port")) {
-					switch_rtp_set_start_port(atoi(val));
+					switch_rtp_set_start_port((switch_port_t)atoi(val));
 				}
 				else if (!strcasecmp(var, "rtp-end-port")) {
-					switch_rtp_set_end_port(atoi(val));
+					switch_rtp_set_end_port((switch_port_t)atoi(val));
 				}
 			}
 		}
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 9d548146f4..0b54c8f925 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -857,7 +857,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 				
 				rtp_session->recv_msg.header.pt = (uint32_t) rtp_session->cng_pt ? rtp_session->cng_pt : SWITCH_RTP_CNG_PAYLOAD;
 				*flags |= SFF_CNG;
-				*payload_type = rtp_session->recv_msg.header.pt;
+				*payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt;
 				return 2 + rtp_header_len;
 			}
 		}
@@ -877,7 +877,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 
 			rtp_session->recv_msg.header.pt = (uint32_t) rtp_session->cng_pt ? rtp_session->cng_pt : SWITCH_RTP_CNG_PAYLOAD;
 			*flags |= SFF_CNG;
-			*payload_type = rtp_session->recv_msg.header.pt;
+			*payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt;
 			return 2 + rtp_header_len;
 		}