diff --git a/src/connection.c b/src/connection.c
index 466d7658..dbc0e038 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -79,7 +79,7 @@ static mutex_t _connection_mutex;
 static volatile unsigned long _current_id = 0;
 static int _initialized = 0;
 
-static volatile con_queue_t *_queue = NULL;
+volatile static con_queue_t *_queue = NULL;
 static mutex_t _queue_mutex;
 
 static thread_queue_t *_conhands = NULL;
diff --git a/src/fserve.c b/src/fserve.c
index 63aef2f2..b3a97759 100644
--- a/src/fserve.c
+++ b/src/fserve.c
@@ -61,7 +61,7 @@
 #endif
 
 static fserve_t *active_list = NULL;
-static volatile fserve_t *pending_list = NULL;
+volatile static fserve_t *pending_list = NULL;
 
 static mutex_t pending_lock;
 static avl_tree *mimetypes = NULL;
diff --git a/src/stats.c b/src/stats.c
index 0989b6f8..7d73fd7d 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -57,17 +57,17 @@ typedef struct _event_listener_tag
     struct _event_listener_tag *next;
 } event_listener_t;
 
-static volatile int _stats_running = 0;
+volatile static int _stats_running = 0;
 static thread_type *_stats_thread_id;
-static volatile int _stats_threads = 0;
+volatile static int _stats_threads = 0;
 
 static stats_t _stats;
 static mutex_t _stats_mutex;
 
-static volatile stats_event_t *_global_event_queue;
+volatile static stats_event_t *_global_event_queue;
 mutex_t _global_event_mutex;
 
-static volatile event_listener_t *_event_listeners;
+volatile static event_listener_t *_event_listeners;
 
 
 static void *_stats_thread(void *arg);
@@ -398,7 +398,7 @@ static void modify_node_event (stats_node_t *node, stats_event_t *event)
         str = (char *)strdup (event->value);
     free (node->value);
     node->value = str;
-    /* DEBUG3 ("update node %s \"%s\" (%d)", node->name, node->value, event->action); */
+    DEBUG2 ("update node %s (%s)", node->name, node->value);
 }
 
 
diff --git a/src/yp.c b/src/yp.c
index c5f9bd20..a6ec0d3d 100644
--- a/src/yp.c
+++ b/src/yp.c
@@ -84,7 +84,7 @@ typedef struct ypdata_tag
 static rwlock_t yp_lock;
 static mutex_t yp_pending_lock;
 
-static volatile struct yp_server *active_yps = NULL, *pending_yps = NULL;
+volatile static struct yp_server *active_yps = NULL, *pending_yps = NULL;
 static volatile int yp_update = 0;
 static int yp_running;
 static time_t now;