diff --git a/lib/header.c b/lib/header.c
index 8e985db5..663f45c6 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -24,6 +24,9 @@
 
 const unsigned char *lws_token_to_string(enum lws_token_indexes token)
 {
+	if (token == WSI_TOKEN_HTTP_URI_ARGS)
+		return (unsigned char *)"Uri-Args:";
+
 	if ((unsigned int)token >= ARRAY_SIZE(set))
 		return NULL;
 	return (unsigned char *)set[token];
diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index da78fbfc..03155a7a 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -973,7 +973,7 @@ libwebsocket_set_proxy(struct lws_context *context, const char *proxy)
 	return lws_set_proxy(context, proxy);
 }
 
-#undef lws_context_destroy
+#undef libwebsocket_context_destroy
 LWS_VISIBLE LWS_EXTERN void
 libwebsocket_context_destroy(struct lws_context *context)
 {
@@ -1029,7 +1029,7 @@ libwebsocket_service_fd(struct lws_context *context,
 	return lws_service_fd(context, pollfd);
 }
 
-#undef lws_context_user
+#undef libwebsocket_context_user
 LWS_VISIBLE LWS_EXTERN void *
 libwebsocket_context_user(struct lws_context *context)
 {