diff --git a/src/albanian/CatSqi.gf b/src/albanian/CatSqi.gf
index dee0df43..b029edc3 100644
--- a/src/albanian/CatSqi.gf
+++ b/src/albanian/CatSqi.gf
@@ -9,8 +9,6 @@ lincat V, VA, VV, VS, VQ = Verb ;
 lincat V2, V2S, V2Q = Verb ** {c2 : Compl} ;
 lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ;
 lincat Prep = Compl ;
-lincat Interj = {s : Str} ;
-lincat Voc = {s : Str} ;
 
 lincat Numeral = {s : Str} ;
 lincat Digits  = {s : Str; n : Number; tail : DTail} ;
@@ -24,7 +22,4 @@ lincat Det = {s : Case => Gender => Str; spec : Species; n : Number} ;
 lincat NP = {s: Case => Str; a : Agr} ;
 lincat Pron = {s: Case => Str; acc_clit, dat_clit : Str; a : Agr} ;
 
-lincat PConj = {s : Str} ;
-lincat Phr, Utt = {s : Str} ;
-
 }
diff --git a/src/amharic/ResAmh.gf b/src/amharic/ResAmh.gf
index b21ec291..0195ae06 100644
--- a/src/amharic/ResAmh.gf
+++ b/src/amharic/ResAmh.gf
@@ -995,8 +995,8 @@ pronNP : (N,A,G,D : Str) -> PerNumGen -> NP = \N,A,G,D,png-> {
     {     
       s = \\c =>case c of
 		{
-		Gen|Dat => affix!c + word;
-		   _    => word + affix!c 
+		Gen|Dat => affix!c ++ Predef.BIND ++ word;
+		   _    => word ++ Predef.BIND ++ affix!c 
 		};
       a = {png = Per3 n Masc ; isPron = False };
       lock_NP = <>
diff --git a/src/french/LangFre.gf b/src/french/LangFre.gf
index 97046240..041fe57d 100644
--- a/src/french/LangFre.gf
+++ b/src/french/LangFre.gf
@@ -3,6 +3,7 @@
 concrete LangFre of Lang = 
   GrammarFre,
   LexiconFre
+  ,MarkupFre - [stringMark]
   ,DocumentationFre --# notpresent
   ,ConstructionFre
   ** {
diff --git a/src/kazakh/CatKaz.gf b/src/kazakh/CatKaz.gf
index edc13811..aa9f2ac2 100644
--- a/src/kazakh/CatKaz.gf
+++ b/src/kazakh/CatKaz.gf
@@ -9,7 +9,5 @@ lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ;
 lincat A = {s : Str} ;
 lincat A2 = A ** {c2 : Compl} ;
 lincat Prep = Compl ;
-lincat Interj = {s : Str} ;
-lincat Voc = {s : Str} ;
 
 }
diff --git a/src/morphodict/MorphoDictChi.gf b/src/morphodict/MorphoDictChi.gf
new file mode 100644
index 00000000..6dbea5e6
--- /dev/null
+++ b/src/morphodict/MorphoDictChi.gf
@@ -0,0 +1,7 @@
+--# -path=.:alltenses
+concrete MorphoDictChi of MorphoDictChiAbs =
+CatChi [N,A,V,Adv,Prep] **
+open
+ParadigmsChi
+in
+{}
\ No newline at end of file
diff --git a/src/morphodict/MorphoDictChiAbs.gf b/src/morphodict/MorphoDictChiAbs.gf
new file mode 100644
index 00000000..f2b4aee6
--- /dev/null
+++ b/src/morphodict/MorphoDictChiAbs.gf
@@ -0,0 +1,3 @@
+abstract MorphoDictChiAbs =
+  Cat [N,A,V,Adv,Prep] **
+{}