diff --git a/lib/modules/Calendar.pmod/Time.pmod b/lib/modules/Calendar.pmod/Time.pmod
index c90b4fa2bef73985257da53456f8eb681453c6a0..d179427c7674c34eebf4d951de8a72b4045ec958 100644
--- a/lib/modules/Calendar.pmod/Time.pmod
+++ b/lib/modules/Calendar.pmod/Time.pmod
@@ -245,12 +245,12 @@ class TimeofDay
       }
    }
    
-   cSecond beginning()
+   TimeRange beginning()
    {
       return Second("timeofday_sd",rules,ux,0,ls,utco)->autopromote();
    }
 
-   cSecond end()
+   TimeRange end()
    {
       return Second("timeofday",rules,ux+len,0)->autopromote();
    }
@@ -914,7 +914,7 @@ class TimeofDay
    {
       if (ls==CALUNKNOWN) make_local();
       int u=utc_offset();
-      return sprintf("%s, %s %s %s %d:%02d:%02d %+03d%02d",
+      return sprintf("%s, %s %s %s %02d:%02d:%02d %+03d%02d",
 		     base->week_day_shortname(),
 		     base->month_day_name(),
 		     base->month_shortname(),