Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	28 Nov 2008 00:01:32 -0000	1.34
+++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl	12 Dec 2008 13:30:02 -0000	1.35
@@ -165,13 +165,17 @@
 ::xotcl::Object instproc log msg {
   ns_log notice "$msg, [self] [self callingclass]->[self callingproc] ([my __timediff])"
 }
+::xotcl::Object instproc ds msg {
+  ds_comment "[self]: $msg, ([self callingclass]->[self callingproc] [my __timediff])"
+}
 
+
 ::xotcl::Object instproc debug msg {
   ns_log debug "[self] [self callingclass]->[self callingproc]: $msg"
 }
 ::xotcl::Object instproc msg {{-html false} msg} {
   if {[ns_conn isconnected]} {
-    set msg "$msg  ([self] [self callingclass]->[self callingproc])"
+    set msg "[self]: $msg  ([self callingclass]->[self callingproc])"
     if {$html} {
         util_user_message -html -message $msg
     } else {
Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	26 Nov 2008 23:11:54 -0000	1.38
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	12 Dec 2008 13:30:02 -0000	1.39
@@ -685,7 +685,10 @@
 
   TABLE::Field instproc renderSortLabels {} {
     set field [my set orderby]
-    upvar #[template::adp_level] orderby orderby
+    set lvl [template::adp_level]
+    if {$lvl ne ""} {
+      upvar #$lvl orderby orderby
+    }
     if {![info exists orderby]} {set orderby ""}
     set new_orderby $orderby
     if {$orderby eq "$field,desc"} {