diff --git a/lib/modules/Calendar.pmod/Gregorian.pmod b/lib/modules/Calendar.pmod/Gregorian.pmod
index 0a1094a24fd1b8016e678fcc887fb38843fd39c0..801570457a3758876afc63c97cc5349d43dba33e 100644
--- a/lib/modules/Calendar.pmod/Gregorian.pmod
+++ b/lib/modules/Calendar.pmod/Gregorian.pmod
@@ -191,7 +191,6 @@ class Year
 	    month_mapping=
 	       mkmapping(Array.map(month_names,lower_case),
 			 indices(allocate(13))[1..]);
-	    werror(sprintf("%O\n",month_mapping));
 	 }
 	 n=month_mapping[lower_case(n)];
 	 if (!n) return 0;
diff --git a/lib/modules/Calendar.pmod/ISO.pmod b/lib/modules/Calendar.pmod/ISO.pmod
index a5046bb5c5d70415b31e55b01fb90a27fad937d4..58f809e03d1d2b2a6bc50eeedfa6f594473b6dfb 100644
--- a/lib/modules/Calendar.pmod/ISO.pmod
+++ b/lib/modules/Calendar.pmod/ISO.pmod
@@ -1,10 +1,10 @@
 // IS-8601, international standard
 
-inherit Calendar.Gregorian;
+inherit Calendar.Gregorian:Gregorian;
 
 class Year
 {
-   inherit Calendar.Gregorian.Year;
+   inherit Gregorian::Year;
 
    int leap_day()
    {
@@ -15,7 +15,7 @@ class Year
 
 class Week
 {
-   inherit Calendar.Gregorian.Week;
+   inherit Gregorian::Week;
 
    int yday()
    {
@@ -56,7 +56,7 @@ class Week
 
 class Day
 {
-   inherit Calendar.Gregorian.Day;
+   inherit Gregorian::Day;
 
    int week_day()
    {