diff --git a/inc/ui/collection-edit.php b/inc/ui/collection-edit.php
index b310eb3f..4f8fda87 100644
--- a/inc/ui/collection-edit.php
+++ b/inc/ui/collection-edit.php
@@ -169,7 +169,7 @@ label.privilege {
 </style>
 <table>
  <tr> <th class="right">$prompt_collection_id:</th>    <td class="left">$value_id</td> </tr>
- <tr> <th class="right">$prompt_dav_name:</th>         <td class="left">/caldav.php$value_dav_name</td> </tr>
+ <tr> <th class="right">$prompt_dav_name:</th>         <td class="left">$c->base_name/caldav.php$value_dav_name</td> </tr>
  <tr> <th class="right">$prompt_displayname:</th>      <td class="left">##dav_displayname.input.50##</td> </tr>
  <tr> <th class="right">$prompt_public:</th>           <td class="left">##publicly_readable.checkbox##</td> </tr>
  <tr> <th class="right">$prompt_calendar:</th>         <td class="left">##is_calendar.checkbox##</td> </tr>
diff --git a/inc/ui/principal-browse.php b/inc/ui/principal-browse.php
index 7eb45837..3ae84f33 100644
--- a/inc/ui/principal-browse.php
+++ b/inc/ui/principal-browse.php
@@ -43,4 +43,3 @@ else {
 $browser->DoQuery();
 $page_elements[] = $browser;
 
-
diff --git a/inc/ui/principal-edit.php b/inc/ui/principal-edit.php
index 7d1796f6..e9a49518 100644
--- a/inc/ui/principal-edit.php
+++ b/inc/ui/principal-edit.php
@@ -234,7 +234,7 @@ if ( $editor->Value('type_id') == 3 ) {
   }
 
   function edit_group_row( $row_data ) {
-    global $grouprow, $id;
+    global $grouprow, $id, $c;
 
     $form_url = preg_replace( '#&(edit|delete)_group=\d+#', '', $_SERVER['REQUEST_URI'] );
 
@@ -329,7 +329,7 @@ EOTEMPLATE;
   }
 
   function edit_grant_row( $row_data ) {
-    global $grantrow, $id, $privilege_xlate, $privilege_names;
+    global $grantrow, $id, $c, $privilege_xlate, $privilege_names;
 
     if ( $row_data->to_principal > -1 ) {
       $grantrow->SetRecord( $row_data );