diff --git a/TellusAgent.c b/TellusAgent.c
index 6ad66f7..e6824b0 100644
--- a/TellusAgent.c
+++ b/TellusAgent.c
@@ -82,9 +82,8 @@
 #define EVENT_LIST_LENGTH  (4 + 4)
 
 #define BUFFER_SIZE        2048
-#define PROXY_PORT_COUNT   3
-
 #define WATCH_THRESHOLD    20
+#define PROXY_PORT_COUNT   3
 
 int serviceMode = MODE_CONSOLE;
 
@@ -266,7 +265,7 @@ int main(int argc, const char* argv[])
     if ((handle < 0) ||
         (bind(handle, (struct sockaddr*)&proxySocketAddress, proxySocketLength) < 0))
     {
-      print("Error opening port for Multi-Site Connect\n");
+      print("Error opening ports for Multi-Site Connect\n");
       return EXIT_FAILURE;
     }
 
@@ -395,7 +394,7 @@ int main(int argc, const char* argv[])
   // Main loop
 
   bool running = true;
-  int watchDog = 0;
+  size_t watchDog = 0;
 
   print("Server started\n");