diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index 06aa7e72..550592a7 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -944,7 +944,7 @@ int net__socket_connect(struct mosquitto *mosq, const char *host, uint16_t port,
 
 
 #ifdef WITH_TLS
-static net__handle_ssl(struct mosquitto* mosq, int ret)
+static int net__handle_ssl(struct mosquitto* mosq, int ret)
 {
 	int err;
 
diff --git a/src/mux_poll.c b/src/mux_poll.c
index eefd1c93..8d6bb2f1 100644
--- a/src/mux_poll.c
+++ b/src/mux_poll.c
@@ -106,7 +106,7 @@ int mux_poll__init(struct mosquitto__listener_sock *listensock, int listensock_c
 }
 
 
-static mux_poll__add(struct mosquitto* context, int evt)
+static int mux_poll__add(struct mosquitto* context, uint16_t evt)
 {
 	size_t i;
 
@@ -116,7 +116,7 @@ static mux_poll__add(struct mosquitto* context, int evt)
 
 	if(context->pollfd_index != -1){
 		pollfds[context->pollfd_index].fd = context->sock;
-		pollfds[context->pollfd_index].events = evt;
+		pollfds[context->pollfd_index].events = (short int)evt;
 		pollfds[context->pollfd_index].revents = 0;
 	}else{
 		for(i=0; i<pollfd_max; i++) {