diff --git a/lib/src/latvian/ParadigmsLav.gf b/lib/src/latvian/ParadigmsLav.gf
index 8bd1df084..37433ba65 100644
--- a/lib/src/latvian/ParadigmsLav.gf
+++ b/lib/src/latvian/ParadigmsLav.gf
@@ -160,7 +160,7 @@ oper
     mkConj : Str -> Str -> Number -> Conj = mk2Conj ;
   } ;
 
-  mk2Conj : Str -> Str -> Number -> Conj = \c1,c2,n -> lin Conj (sd2 c1 c2 ** {num = n}) ;
+  mk2Conj : Str -> Str -> Number -> Conj = \c1,c2,n -> lin Conj (sd2 c1 ("," ++ c2) ** {num = n}) ;
 
   -- Numerals: need review (TODO)
 
diff --git a/lib/src/latvian/StructuralLav.gf b/lib/src/latvian/StructuralLav.gf
index 93f7706ca..61f96dfd3 100644
--- a/lib/src/latvian/StructuralLav.gf
+++ b/lib/src/latvian/StructuralLav.gf
@@ -166,8 +166,8 @@ lin
   otherwise_PConj = ss "citādi" ;
   therefore_PConj = ss "tāpēc" ;
 
-  both7and_DConj = mkConj "gan" ("," ++ "gan"); -- FIXME: komati nav tā kā vajag
-  either7or_DConj = mkConj ("vai" ++ "nu") ("," ++ "vai") Sg ; -- FIXME: komati nav tā kā vajag
+  both7and_DConj = mkConj "gan" "gan" ;
+  either7or_DConj = mkConj ("vai" ++ "nu") "vai" Sg ;
 
   whoSg_IP = { -- FIXME: Fem
     s = table {