diff --git a/examples/stoneage1/StoneageI.gf b/examples/stoneage1/StoneageI.gf
index 54e66bbc3..392fc6ebf 100644
--- a/examples/stoneage1/StoneageI.gf
+++ b/examples/stoneage1/StoneageI.gf
@@ -85,7 +85,7 @@ lin
   Few = DetCN few_Det ;
   Other = DetCN other_Det ;
 
-  One = DetCN (DetSg one_Quant NoOrd) ;
+  One = DetCN one_Det ;
   Two = DetCN (DetPl (PlQuant IndefArt) two_Num NoOrd) ;
   Three = DetCN (DetPl (PlQuant IndefArt) three_Num NoOrd) ;
   Four = DetCN (DetPl (PlQuant IndefArt) four_Num NoOrd) ;
diff --git a/lib/resource-1.0/finnish/MorphoFin.gf b/lib/resource-1.0/finnish/MorphoFin.gf
index a0b269581..04eaedb0b 100644
--- a/lib/resource-1.0/finnish/MorphoFin.gf
+++ b/lib/resource-1.0/finnish/MorphoFin.gf
@@ -652,7 +652,6 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
 
   reg2VerbH : (soutaa,souti : Str) -> VerbH = \soutaa,souti ->
   let
-----    soudat = regVerbH soutaa ;
     soudan = weakGrade (init soutaa) + "n" ;
     soudin = weakGrade souti + "n" ;
     souden = init souti + "en" ;
@@ -666,8 +665,8 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
     "ata" | "ätä" => vPalkata soutaa souti ;
     "ota" | "ötä" => vPudota soutaa souti ;
     "sta" | "stä" => vJuosta soutaa souden (juo +   o+u+"t") (juo + "t"+u) ;
-    _ + ("da" | "dä") => vJuoda soutaa souti
-----    _ => soudat
+    _ + ("da" | "dä") => vJuoda soutaa souti ;
+    _ => regVerbH soutaa
     } ;
 
   reg3VerbH : (_,_,_ : Str) -> VerbH = \soutaa,soudan,souti -> 
@@ -679,11 +678,10 @@ caseTable : Number -> CommonNoun -> Case => Str = \n,cn ->
     a = last taa ;
     u = ifTok Str a "a" "u" "y" ;
     soudin = souti + "n" ; ----weakGrade souti + "n" ;
-    ----soudat = reg2VerbH soutaa souti ;
   in case taa of {
     "lla" | "llä" => vJuosta soutaa soudan (juo +   o+u+"t") (juo + "t"+u) ;
-    "taa" | "tää" => vHuoltaa soutaa soudan souti soudin
-----    _ => soudat
+    "taa" | "tää" => vHuoltaa soutaa soudan souti soudin ;
+    _ => reg2VerbH soutaa souti
     } ;
 
 -- For "harppoa", "hukkua", "löytyä", with grade alternation.
diff --git a/lib/resource-1.0/italian/LexiconIta.gf b/lib/resource-1.0/italian/LexiconIta.gf
index 49d83cbc8..0676cd975 100644
--- a/lib/resource-1.0/italian/LexiconIta.gf
+++ b/lib/resource-1.0/italian/LexiconIta.gf
@@ -114,7 +114,7 @@ lin
   lose_V2 = dirV2 (verboV (perdere_62 "perdere")) ;
   love_N = regN "amore" ;
   love_V2 = dirV2 (regV "amare") ;
-  man_N = regN "uomo" ;
+  man_N = mkN "uomo" "uomini" masculine ;
   married_A2 = mkA2 (regA "sposato") dative ;
   meat_N = femN (regN "carne") ;
   milk_N = regN "latte" ;
diff --git a/lib/resource-1.0/swadesh/Swadesh.gf b/lib/resource-1.0/swadesh/Swadesh.gf
index 0c4bb11e3..4057d1ab4 100644
--- a/lib/resource-1.0/swadesh/Swadesh.gf
+++ b/lib/resource-1.0/swadesh/Swadesh.gf
@@ -50,7 +50,7 @@ abstract Swadesh = Cat ** {
 
     -- Numerals
 
-    one_Num : Num ;
+    one_Det : Det ;
     two_Num : Num ;
     three_Num : Num ;
     four_Num : Num ;
diff --git a/lib/resource-1.0/swadesh/SwadeshEng.gf b/lib/resource-1.0/swadesh/SwadeshEng.gf
index afce88603..d85de74e2 100644
--- a/lib/resource-1.0/swadesh/SwadeshEng.gf
+++ b/lib/resource-1.0/swadesh/SwadeshEng.gf
@@ -52,7 +52,7 @@ concrete SwadeshEng of Swadesh = CatEng
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/lib/resource-1.0/swadesh/SwadeshFin.gf b/lib/resource-1.0/swadesh/SwadeshFin.gf
index e56addbfe..f59462fd6 100644
--- a/lib/resource-1.0/swadesh/SwadeshFin.gf
+++ b/lib/resource-1.0/swadesh/SwadeshFin.gf
@@ -61,7 +61,7 @@ concrete SwadeshFin of Swadesh = CatFin
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/lib/resource-1.0/swadesh/SwadeshFre.gf b/lib/resource-1.0/swadesh/SwadeshFre.gf
index 3a7b97531..0a4ba93ca 100644
--- a/lib/resource-1.0/swadesh/SwadeshFre.gf
+++ b/lib/resource-1.0/swadesh/SwadeshFre.gf
@@ -57,7 +57,7 @@ concrete SwadeshFre of Swadesh = CatFre
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/lib/resource-1.0/swadesh/SwadeshGer.gf b/lib/resource-1.0/swadesh/SwadeshGer.gf
index bd77b6df7..242d23cca 100644
--- a/lib/resource-1.0/swadesh/SwadeshGer.gf
+++ b/lib/resource-1.0/swadesh/SwadeshGer.gf
@@ -52,7 +52,7 @@ concrete SwadeshGer of Swadesh = CatGer
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/lib/resource-1.0/swadesh/SwadeshIta.gf b/lib/resource-1.0/swadesh/SwadeshIta.gf
index 97506fbaa..618e40589 100644
--- a/lib/resource-1.0/swadesh/SwadeshIta.gf
+++ b/lib/resource-1.0/swadesh/SwadeshIta.gf
@@ -56,7 +56,7 @@ concrete SwadeshIta of Swadesh = CatIta
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/lib/resource-1.0/swadesh/SwadeshNor.gf b/lib/resource-1.0/swadesh/SwadeshNor.gf
index fad6d8cd7..7ad64f3bc 100644
--- a/lib/resource-1.0/swadesh/SwadeshNor.gf
+++ b/lib/resource-1.0/swadesh/SwadeshNor.gf
@@ -50,7 +50,7 @@ concrete SwadeshNor of Swadesh = CatNor
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/lib/resource-1.0/swadesh/SwadeshRus.gf b/lib/resource-1.0/swadesh/SwadeshRus.gf
index 925a3eab6..43be5fbfa 100644
--- a/lib/resource-1.0/swadesh/SwadeshRus.gf
+++ b/lib/resource-1.0/swadesh/SwadeshRus.gf
@@ -52,7 +52,7 @@ flags  coding=utf8 ;
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/lib/resource-1.0/swadesh/SwadeshSpa.gf b/lib/resource-1.0/swadesh/SwadeshSpa.gf
index f556ff10e..c7a940835 100644
--- a/lib/resource-1.0/swadesh/SwadeshSpa.gf
+++ b/lib/resource-1.0/swadesh/SwadeshSpa.gf
@@ -59,7 +59,7 @@ concrete SwadeshSpa of Swadesh = CatSpa
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;
diff --git a/lib/resource-1.0/swadesh/SwadeshSwe.gf b/lib/resource-1.0/swadesh/SwadeshSwe.gf
index a1118af77..d9a6e9523 100644
--- a/lib/resource-1.0/swadesh/SwadeshSwe.gf
+++ b/lib/resource-1.0/swadesh/SwadeshSwe.gf
@@ -52,7 +52,7 @@ concrete SwadeshSwe of Swadesh = CatSwe
 
     -- Numerals
 
-    one_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 pot01)))) ;
+    one_Det = DetSg one_Quant NoOrd ;
     two_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n2))))) ;
     three_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n3))))) ;
     four_Num = NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n4))))) ;