diff --git a/src/udp.c b/src/udp.c
index 51d6402..512cc0b 100644
--- a/src/udp.c
+++ b/src/udp.c
@@ -15,6 +15,14 @@
 #include "options.h"
 #include "udp.h"
 
+/* min and max macros */
+#ifndef MIN
+#define MIN(x, y) ((x) < (y) ? x : y)
+#endif 
+#ifndef MAX
+#define MAX(x, y) ((x) > (y) ? x : y)
+#endif 
+
 /*=========================================================================*\
 * Internal function prototypes
 \*=========================================================================*/
diff --git a/test/mimetest.lua b/test/mimetest.lua
index 2d5bce6..808c402 100644
--- a/test/mimetest.lua
+++ b/test/mimetest.lua
@@ -8,7 +8,7 @@ local qptest = "qptest.bin"
 local eqptest = "qptest.bin2"
 local dqptest = "qptest.bin3"
 
-local b64test = "luasocket.dylib"
+local b64test = "luasocket.so"
 local eb64test = "b64test.bin"
 local db64test = "b64test.bin2"
 
diff --git a/test/testclnt.lua b/test/testclnt.lua
index 14d3484..6735113 100644
--- a/test/testclnt.lua
+++ b/test/testclnt.lua
@@ -1,4 +1,4 @@
-require"socket"
+socket = require"socket"
 
 host = host or "localhost"
 port = port or "8080"
diff --git a/test/testsrvr.lua b/test/testsrvr.lua
index cf94b45..6e786c8 100644
--- a/test/testsrvr.lua
+++ b/test/testsrvr.lua
@@ -1,4 +1,4 @@
-require"socket"
+socket = require"socket"
 
 host = host or "localhost"
 port = port or "8080"