diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile
index c9c2daa74..aa050f5ce 100644
--- a/lib/resource-1.0/Makefile
+++ b/lib/resource-1.0/Makefile
@@ -29,7 +29,7 @@ alltenses:
 	$(GFC) german/German.gf
 	$(GFC) italian/Italian.gf
 	$(GFC) norwegian/Norwegian.gf
-	$(GFC) russian/LangRus.gf
+	$(GFC) russian/Russian.gf
 	$(GFC) spanish/Spanish.gf
 	$(GFC) swedish/Swedish.gf
 	cp -p */*.gfc */*.gfr ../alltenses
diff --git a/lib/resource-1.0/mathematical/MathematicalFre.gf b/lib/resource-1.0/mathematical/MathematicalFre.gf
index 006422322..65eb6a9b5 100644
--- a/lib/resource-1.0/mathematical/MathematicalFre.gf
+++ b/lib/resource-1.0/mathematical/MathematicalFre.gf
@@ -11,7 +11,7 @@ concrete MathematicalFre of Mathematical =
   RelativeFre,
   ConjunctionFre,
   PhraseFre,
-  TextX,
+  TextX - [Tense,TPres,TPast,TFut,TCond],
   IdiomFre,
   StructuralFre,
   
diff --git a/lib/resource-1.0/mathematical/MathematicalIta.gf b/lib/resource-1.0/mathematical/MathematicalIta.gf
index efdec3bbd..0591ef6c6 100644
--- a/lib/resource-1.0/mathematical/MathematicalIta.gf
+++ b/lib/resource-1.0/mathematical/MathematicalIta.gf
@@ -11,7 +11,7 @@ concrete MathematicalIta of Mathematical =
   RelativeIta,
   ConjunctionIta,
   PhraseIta,
-  TextX,
+  TextX - [Tense,TPres,TPast,TFut,TCond],
   IdiomIta,
   StructuralIta,
 
diff --git a/lib/resource-1.0/mathematical/MathematicalSpa.gf b/lib/resource-1.0/mathematical/MathematicalSpa.gf
index 059e1cb4b..92cebf436 100644
--- a/lib/resource-1.0/mathematical/MathematicalSpa.gf
+++ b/lib/resource-1.0/mathematical/MathematicalSpa.gf
@@ -11,7 +11,7 @@ concrete MathematicalSpa of Mathematical =
   RelativeSpa,
   ConjunctionSpa,
   PhraseSpa,
-  TextSpa,
+  TextSpa - [Tense,TPres,TPast,TFut,TCond],
   IdiomSpa,
   StructuralSpa,
 
diff --git a/lib/resource-1.0/multimodal/MultiEng.gf b/lib/resource-1.0/multimodal/MultiEng.gf
index 75bc660fe..169acd98b 100644
--- a/lib/resource-1.0/multimodal/MultiEng.gf
+++ b/lib/resource-1.0/multimodal/MultiEng.gf
@@ -20,7 +20,7 @@ concrete MultiEng of Multi =
       everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv,
       somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv,
       every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det,
-    ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP,
+    ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpPl1,
     already_Adv, far_Adv, now_Adv
     ]
   ** MultiI with
diff --git a/lib/resource-1.0/multimodal/MultiFin.gf b/lib/resource-1.0/multimodal/MultiFin.gf
index 175ab966b..d5cb62517 100644
--- a/lib/resource-1.0/multimodal/MultiFin.gf
+++ b/lib/resource-1.0/multimodal/MultiFin.gf
@@ -20,7 +20,7 @@ concrete MultiFin of Multi =
       everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv,
       somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv,
       every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det,
-    ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP,
+    ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpPl1,
     already_Adv, far_Adv, now_Adv
     ]
   ** MultiI with
diff --git a/lib/resource-1.0/multimodal/MultiFre.gf b/lib/resource-1.0/multimodal/MultiFre.gf
index 4000c14ae..aff4bcd20 100644
--- a/lib/resource-1.0/multimodal/MultiFre.gf
+++ b/lib/resource-1.0/multimodal/MultiFre.gf
@@ -20,7 +20,7 @@ concrete MultiFre of Multi =
       everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv,
       somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv,
       every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det,
-    ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP,
+    ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpPl1,
     already_Adv, far_Adv, now_Adv
     ]
   ** MultiI with
diff --git a/lib/resource-1.0/multimodal/MultiI.gf b/lib/resource-1.0/multimodal/MultiI.gf
index 24546b2cc..98084f2d5 100644
--- a/lib/resource-1.0/multimodal/MultiI.gf
+++ b/lib/resource-1.0/multimodal/MultiI.gf
@@ -113,6 +113,7 @@ incomplete concrete MultiI of Multi =
   ExistNP np = Lang.ExistNP np ** {point = np.point} ;
   ExistIP ip = Lang.ExistIP ip ** noPoint ;
   ProgrVP vp = Lang.ProgrVP vp ** {point = vp.point} ;
+  ImpPl1 vp = Lang.ImpPl1 vp ** {point = vp.point} ;
 
   everybody_NP = Lang.everybody_NP ** noPoint ;
   everything_NP = Lang.everything_NP ** noPoint ;
diff --git a/lib/resource-1.0/multimodal/MultiSwe.gf b/lib/resource-1.0/multimodal/MultiSwe.gf
index 957adf029..e765dd0f2 100644
--- a/lib/resource-1.0/multimodal/MultiSwe.gf
+++ b/lib/resource-1.0/multimodal/MultiSwe.gf
@@ -20,7 +20,7 @@ concrete MultiSwe of Multi =
       everywhere_Adv, here_Adv, here7to_Adv, here7from_Adv,
       somewhere_Adv, there_Adv, there7to_Adv, there7from_Adv,
       every_Det, few_Det, many_Det, much_Det, someSg_Det, somePl_Det,
-    ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP,
+    ImpersCl, GenericCl, ExistNP, ExistIP, ProgrVP, ImpPl1,
     already_Adv, far_Adv, now_Adv
     ]
   ** MultiI with
diff --git a/src/GF/Text/UTF8.hs b/src/GF/Text/UTF8.hs
index e27773aad..5e9687684 100644
--- a/src/GF/Text/UTF8.hs
+++ b/src/GF/Text/UTF8.hs
@@ -27,7 +27,8 @@ decodeUTF8 (c:c':c'':cs) | '\xe0' <= c   && c   <= '\xef' &&
 		          '\x80' <= c'  && c'  <= '\xbf' &&
 		          '\x80' <= c'' && c'' <= '\xbf' =
 	toEnum ((fromEnum c `mod` 0x10 * 0x1000) + (fromEnum c' `mod` 0x40) * 0x40 + fromEnum c'' `mod` 0x40) : decodeUTF8 cs
-decodeUTF8 _ = error "UniChar.decodeUTF8: bad data"
+decodeUTF8 s = s ---- AR workaround 22/6/2006
+----decodeUTF8 _ = error "UniChar.decodeUTF8: bad data"
 
 encodeUTF8 :: String -> String
 encodeUTF8 "" = ""