diff --git a/src/Http.c b/src/Http.c
index ec74b9a..0b9b380 100644
--- a/src/Http.c
+++ b/src/Http.c
@@ -327,7 +327,7 @@ HttpUrlDecode(char *str)
 
     i = 0;
     inputLen = strlen(str);
-    decoded = Malloc(inputLen);
+    decoded = Malloc(inputLen + 1);
 
     if (!decoded)
     {
diff --git a/src/Util.c b/src/Util.c
index bc784c2..6bf6b11 100644
--- a/src/Util.c
+++ b/src/Util.c
@@ -33,6 +33,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <limits.h>
 
 unsigned long
 UtilServerTs(void)