diff --git a/pjlib/src/pj/errno.c b/pjlib/src/pj/errno.c
index 667c7d9..e36b326 100644
--- a/pjlib/src/pj/errno.c
+++ b/pjlib/src/pj/errno.c
@@ -217,7 +217,7 @@
 
     /* Build the title */
     len = pj_ansi_vsnprintf(titlebuf, sizeof(titlebuf), title_fmt, marker);
-    if (len < 0 || len >= sizeof(titlebuf))
+    if (len < 0 || len >= (int)sizeof(titlebuf))
 	pj_ansi_strcpy(titlebuf, "Error");
 
     /* Get the error */
diff --git a/pjlib/src/pj/log.c b/pjlib/src/pj/log.c
index 0db0d16..998ba6a 100644
--- a/pjlib/src/pj/log.c
+++ b/pjlib/src/pj/log.c
@@ -30,7 +30,11 @@
 #else
 static int pj_log_max_level = PJ_LOG_MAX_LEVEL;
 #endif
+
+#if PJ_HAS_THREADS
 static long thread_suspended_tls_id = -1;
+#endif
+
 static pj_log_func *log_writer = &pj_log_write;
 static unsigned log_decor = PJ_LOG_HAS_TIME | PJ_LOG_HAS_MICRO_SEC |
 			    PJ_LOG_HAS_SENDER | PJ_LOG_HAS_NEWLINE |
@@ -67,15 +71,15 @@
 static char log_buffer[PJ_LOG_MAX_SIZE];
 #endif
 
+#if PJ_HAS_THREADS
 static void logging_shutdown(void)
 {
-#if PJ_HAS_THREADS
     if (thread_suspended_tls_id != -1) {
 	pj_thread_local_free(thread_suspended_tls_id);
 	thread_suspended_tls_id = -1;
     }
-#endif
 }
+#endif
 
 pj_status_t pj_log_init(void)
 {