diff --git a/server/change.c b/server/change.c
index 9a1a02d095d..0dd7d29d6b6 100644
--- a/server/change.c
+++ b/server/change.c
@@ -451,8 +451,8 @@ struct inode {
     char *name;              /* basename name of the inode */
 };
 
-struct list inode_hash[ HASH_SIZE ];
-struct list wd_hash[ HASH_SIZE ];
+static struct list inode_hash[ HASH_SIZE ];
+static struct list wd_hash[ HASH_SIZE ];
 
 static int inotify_add_dir( char *path, unsigned int filter );
 
diff --git a/server/main.c b/server/main.c
index dd5ed53127b..a59350b552e 100644
--- a/server/main.c
+++ b/server/main.c
@@ -65,14 +65,14 @@ static void parse_args( int argc, char *argv[] )
 
     static struct option long_options[] =
     {
-        {"debug",       2, 0, 'd'},
-        {"foreground",  0, 0, 'f'},
-        {"help",        0, 0, 'h'},
-        {"kill",        2, 0, 'k'},
-        {"persistent",  2, 0, 'p'},
-        {"version",     0, 0, 'v'},
-        {"wait",        0, 0, 'w'},
-        { NULL,         0, 0, 0}
+        {"debug",       2, NULL, 'd'},
+        {"foreground",  0, NULL, 'f'},
+        {"help",        0, NULL, 'h'},
+        {"kill",        2, NULL, 'k'},
+        {"persistent",  2, NULL, 'p'},
+        {"version",     0, NULL, 'v'},
+        {"wait",        0, NULL, 'w'},
+        { NULL,         0, NULL, 0}
     };
 
     server_argv0 = argv[0];