diff --git a/lib/src/swedish/ParadigmsSwe.gf b/lib/src/swedish/ParadigmsSwe.gf
index 76b2bbbbd..fb94feb21 100644
--- a/lib/src/swedish/ParadigmsSwe.gf
+++ b/lib/src/swedish/ParadigmsSwe.gf
@@ -88,9 +88,13 @@ oper
 
     mkN : (nyckel,nycklar : Str) -> N ; -- singular and plural suffice for most nouns
 
--- In the worst case, four forms are needed.
+-- In the worst case, four forms are needed,
 
-    mkN : (museum,museet,museer,museerna : Str) -> N -- worst case for nouns
+    mkN : (museum,museet,museer,museerna : Str) -> N ; -- worst case for nouns
+
+-- and perhaps a gender.
+
+    mkN : (museum,museet,museer,museerna : Str) -> Gender -> N -- even worse case for nouns
   } ;
 
 -- All the functions above work quite as well to form *compound nouns*,
@@ -313,7 +317,8 @@ oper
     mkN : (apa : Str) -> N = regN ;
     mkN : Str -> Gender -> N = regGenN ; 
     mkN : (nyckel, nycklar : Str) -> N = mk2N ; 
-    mkN : (museum,museet,museer,museerna : Str) -> N = mk4N
+    mkN : (museum,museet,museer,museerna : Str) -> N = mk4N ;
+    mkN : (museum,museet,museer,museerna : Str) -> Gender -> N = mk5N
   } ;
 
   mk4N : (museum,museet,museer,museerna : Str) -> N = \apa,apan,apor,aporna ->  {
@@ -324,6 +329,11 @@ oper
       }
     } ** {lock_N = <>} ;
 
+  mk5N : (museum,museet,museer,museerna : Str) -> Gender -> N = \apa,apan,apor,aporna,g ->  {
+    s = nounForms apa apan apor aporna ;
+    g = g
+    } ** {lock_N = <>} ;
+
   regN : Str -> N = \bil -> regGenN bil g where {
     g = case <bil : Str> of {
       _ + "e" => Neutr ;
diff --git a/lib/src/thai/LexiconTha.gf b/lib/src/thai/LexiconTha.gf
index 97ddcc4ef..07390e7af 100644
--- a/lib/src/thai/LexiconTha.gf
+++ b/lib/src/thai/LexiconTha.gf
@@ -51,7 +51,7 @@ lin
 --  brown_A = regADeg "brown" ;
   burn_V = mkV (thword "เผา") ;
 --  butter_N = regN "butter" ;
---  buy_V2 = dirV2 (irregV "buy" "bought" "bought") ;
+  buy_V2 = mkV2 "ซีอ" ;
 --  camera_N = regN "camera" ;
 --  cap_N = regN "cap" ;
   car_N = mkN "รถ" "คัน" ;