Index: openacs-4/packages/acs-subsite/www/group-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.tcl,v
diff -u -N -r1.16 -r1.16.8.1
--- openacs-4/packages/acs-subsite/www/group-master.tcl	22 Mar 2008 18:16:11 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/group-master.tcl	8 Sep 2013 08:16:25 -0000	1.16.8.1
@@ -148,7 +148,7 @@
 
 
 # Find the subsite we belong to
-set subsite_url [site_node_closest_ancestor_package_url]
+set subsite_url [lindex [site_node::get_url_from_object_id -object_id [site_node::closest_ancestor_package -include_self -package_key [subsite::package_keys]]] 0]
 array set subsite_sitenode [site_node::get -url $subsite_url]
 set subsite_node_id $subsite_sitenode(node_id)
 set subsite_name $subsite_sitenode(instance_name)
Index: openacs-4/packages/acs-subsite/www/admin/applications/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index.tcl,v
diff -u -N -r1.10 -r1.10.4.1
--- openacs-4/packages/acs-subsite/www/admin/applications/index.tcl	15 Apr 2011 10:29:16 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/admin/applications/index.tcl	8 Sep 2013 08:16:25 -0000	1.10.4.1
@@ -10,7 +10,7 @@
 set context [list $page_title]
 
 # Get the subsite node ID
-set subsite_url [site_node_closest_ancestor_package_url]
+set subsite_url [lindex [site_node::get_url_from_object_id -object_id [site_node::closest_ancestor_package -include_self -package_key [subsite::package_keys]]] 0]
 array set subsite_sitenode [site_node::get -url $subsite_url]
 set subsite_node_id $subsite_sitenode(node_id)
 
Index: openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl,v
diff -u -N -r1.7.4.1 -r1.7.4.2
--- openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl	6 Sep 2013 16:01:47 -0000	1.7.4.1
+++ openacs-4/packages/acs-subsite/www/permissions/perm-user-add-include.tcl	8 Sep 2013 08:16:26 -0000	1.7.4.2
@@ -16,7 +16,7 @@
 
 set user_id [ad_conn user_id]
 
-set perm_url "[site_node_closest_ancestor_package_url]permissions/"
+set perm_url "[lindex [site_node::get_url_from_object_id -object_id [site_node::closest_ancestor_package -include_self -package_key [subsite::package_keys]]] 0]permissions/"
 
 list::create \
     -name users \