--- loncom/lonnet/perl/lonnet.pm	2007/11/20 00:26:38	1.927
+++ loncom/lonnet/perl/lonnet.pm	2007/12/05 20:06:34	1.929
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.927 2007/11/20 00:26:38 albertel Exp $
+# $Id: lonnet.pm,v 1.929 2007/12/05 20:06:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2685,7 +2685,9 @@ sub set_first_access {
     my ($type)=@_;
     my ($symb,$courseid,$udom,$uname)=&whichuser();
     my ($map,$id,$res)=&decode_symb($symb);
-    if ($type eq 'map') {
+    if ($type eq 'course') {
+	$res='course';
+    } elsif ($type eq 'map') {
 	$res=&symbread($map);
     } else {
 	$res=$symb;
@@ -6851,8 +6853,9 @@ sub metadata {
         unless ($filename=~/\.meta$/) { $filename.='.meta'; }
 	my $metastring;
 	if ($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) {
+	    my $which = &hreflocation('','/'.($liburi || $uri));
 	    $metastring = 
-		&Apache::lonnet::ssi_body(&hreflocation('','/'.$uri),
+		&Apache::lonnet::ssi_body($which,
 					  ('grade_target' => 'meta'));
 	    $cachetime = 1; # only want this cached in the child not long term
 	} elsif ($uri !~ m -^(editupload)/-) {