diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 0a89187c529..30740de70b7 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -180,7 +180,7 @@ smb.conf changes
     config backend			New		file
     ctdb socket				New		""
     debug class				New		No
-    hidden				New		No
+    administrative share		New		No
     lanman auth				Changed Default	No
     ldap debug level			New		0
     ldap debug threshold		New		10
@@ -340,7 +340,7 @@ o   Andreas Schneider <anschneider@suse.de>
       initialization.
     * Fix Windows 2008 (Longhorn) join.
     * Fix crashbug in winbindd.
-    * Add share parameter "hidden".
+    * Add share parameter "administrative share".
 
 
 o   Karolin Seeger <ks@sernet.de>
diff --git a/source/libgpo/gpo_util.c b/source/libgpo/gpo_util.c
index f2d7c6924a3..f41bbc1817f 100644
--- a/source/libgpo/gpo_util.c
+++ b/source/libgpo/gpo_util.c
@@ -738,8 +738,11 @@ NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx,
 		return NT_STATUS_OK;
 	}
 
-	tmp = talloc_asprintf_strupper_m(mem_ctx, "%s/%s/%s", filename, path,
-					 suffix);
+	path = talloc_strdup_upper(mem_ctx, path);
+	NT_STATUS_HAVE_NO_MEMORY(path);
+
+	tmp = talloc_asprintf(mem_ctx, "%s/%s/%s", filename,
+			      path, suffix);
 	NT_STATUS_HAVE_NO_MEMORY(tmp);
 
 	if (sys_stat(tmp, &sbuf) == 0) {
diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index 1333d656d48..ce3fd1a44fa 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -1216,6 +1216,7 @@ NTSTATUS _lsa_Close(pipes_struct *p, struct lsa_Close *r)
 	}
 
 	close_policy_hnd(p, r->in.handle);
+	ZERO_STRUCTP(r->out.handle);
 	return NT_STATUS_OK;
 }