diff --git a/models/rpc.lua b/models/rpc.lua
index fbd7700..c1cd3b0 100644
--- a/models/rpc.lua
+++ b/models/rpc.lua
@@ -48,8 +48,8 @@ local function set_age(path, input)
 end
 
 return {
-    ["/operations/t4:reboot"] = reboot,
-    ["/operations/t4:get-reboot-info"] = get_reboot_info,
+    ["/operations/reboot"] = reboot,
+    ["/operations/get-reboot-info"] = get_reboot_info,
     ["/t4:test/state/reset"] = reset_state,
     ["/t4:test/state/get-last-reset-time"] = get_reset_time,
     ["/t4:test/state/users/*/set-age"] = set_age,
diff --git a/schema.c b/schema.c
index 6e13161..a3fb1a3 100644
--- a/schema.c
+++ b/schema.c
@@ -2747,7 +2747,7 @@ _sch_path_to_gnode (sch_instance * instance, sch_node ** rschema, xmlNs *ns, con
         }
 
         /* Create node - include namespace node mapping if required */
-        if (depth == 0 || nns || is_proxy)
+        if (depth == 0 || is_proxy)
         {
             if (ns && ns->prefix && !_sch_ns_native (instance, ns))
             {