diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index 684b214b59..4ca3013893 100644
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -2099,8 +2099,8 @@ static switch_status_t event_chat_send(char *proto, char *from, char *to, char *
 		if (hint) switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Hint", "%s", hint);
 		if (body) switch_event_add_body(event, "%s", body);
 		if (to) { 
-			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "To", "%s", to);
 			const char *v;
+			switch_event_add_header(event, SWITCH_STACK_BOTTOM, "To", "%s", to);
 			if ((v = switch_core_get_variable(to))) {
 				switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Command", "%s", v);
 			}
diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
index 5a0adbedc1..b146e2eab7 100644
--- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
+++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c
@@ -487,15 +487,15 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event,
 									
 									if (clen > 0) {
 										char *body;
-										char *ptr;
+										char *p;
 										
 										switch_zmalloc(body, clen + 1);
 
-										ptr = body;
+										p = body;
 										while(clen > 0) {
 											mlen = clen;
 											
-											status = switch_socket_recv(listener->sock, ptr, &mlen);
+											status = switch_socket_recv(listener->sock, p, &mlen);
 
 											if (!SWITCH_STATUS_IS_BREAK(status) && status != SWITCH_STATUS_SUCCESS) {
 												return SWITCH_STATUS_FALSE;
@@ -507,7 +507,7 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event,
 											}
 
 											clen -= (int) mlen;
-											ptr += mlen;
+											p += mlen;
 										}
 
 										switch_event_add_body(*event, "%s", body);