diff --git a/daemon/nfs41_server.c b/daemon/nfs41_server.c
index 61e21e0..0eeec06 100644
--- a/daemon/nfs41_server.c
+++ b/daemon/nfs41_server.c
@@ -216,11 +216,14 @@ int nfs41_server_find_or_create(
     IN const netaddr4 *addr,
     OUT nfs41_server **server_out)
 {
-    const struct server_info info = { server_scope, server_owner_major_id };
+    struct server_info info;
     struct list_entry *entry;
     nfs41_server *server;
     int status;
 
+    info.owner = server_owner_major_id;
+    info.scope = server_scope;
+
     dprintf(SRVLVL, "--> nfs41_server_find_or_create(%s)\n", info.owner);
 
     EnterCriticalSection(&g_server_list.lock);
diff --git a/daemon/readdir.c b/daemon/readdir.c
index dc350bd..8abd2c7 100644
--- a/daemon/readdir.c
+++ b/daemon/readdir.c
@@ -315,8 +315,9 @@ static int readdir_copy_entry(
         lookup_entry(args->root, args->state->session,
             &args->state->file, entry);
     } else if (entry->attr_info.type == NF4LNK) {
-        const nfs41_component name = { entry->name,
-            (unsigned short)entry->name_len - 1 };
+        nfs41_component name;
+        name.name = entry->name;
+        name.len = (unsigned short)entry->name_len - 1;
         /* look up the symlink target to see whether it's a directory */
         lookup_symlink(args->root, args->state->session,
             &args->state->file, &name, &entry->attr_info);