diff --git a/lib/src/catalan/StructuralCat.gf b/lib/src/catalan/StructuralCat.gf
index 2cea9e334..bb6415db1 100644
--- a/lib/src/catalan/StructuralCat.gf
+++ b/lib/src/catalan/StructuralCat.gf
@@ -1,5 +1,6 @@
 concrete StructuralCat of Structural = CatCat ** 
-  open PhonoCat, MorphoCat, ParadigmsCat, BeschCat, (X = ConstructX), Prelude in {
+  open PhonoCat, MorphoCat, ParadigmsCat, BeschCat, 
+       MakeStructuralCat, (X = ConstructX), Prelude in {
 
   flags optimize=all ; coding=utf8 ;
 
@@ -190,6 +191,7 @@ lin
   at_most_AdN = X.mkAdN "com a màxim" ;
   except_Prep = mkPrep "excepte" ;
   as_CAdv = X.mkCAdv "tan" "com" ;
+  that_Subj = {s = "que" ; m = Conjunct} ;
 
   lin language_title_Utt = ss "català" ;
 
diff --git a/lib/src/romanian/LexiconRon.gf b/lib/src/romanian/LexiconRon.gf
index 963409a69..372b13f6b 100644
--- a/lib/src/romanian/LexiconRon.gf
+++ b/lib/src/romanian/LexiconRon.gf
@@ -91,7 +91,6 @@ green_A = mkA "verde" ;
 harbour_N = mkNR "port" ;
 hate_V2 = dirV2 (mkV "urî") ;
 hat_N = mkN "pãlãrie" ;
-have_V2 = dirV2 (v_have) ;
 hear_V2 = dirV2 (v_besch127 "auzi") ;
 hill_N = mkNR "deal" ;
 hope_VS = mkVS (v_besch17 "spera") ;
diff --git a/lib/src/romanian/StructuralRon.gf b/lib/src/romanian/StructuralRon.gf
index aceb99b22..663eafb52 100644
--- a/lib/src/romanian/StructuralRon.gf
+++ b/lib/src/romanian/StructuralRon.gf
@@ -62,6 +62,7 @@ lin
      mkPronoun
       "" "el" "lui" "lui" [] "sãu" "sa" "sãi" "sale"  Masc Sg P3 ;
   
+  have_V2 = dirV2 (v_have) ;
   less_CAdv = {s = "mai puþin" ; sNum = ""; p = conjThan ; lock_CAdv = <> } ; 
   many_Det = mkDet "mulþi" "multe" "multor" "multor" "mulþi" "multe" "multora" "multora" Pl; 
   more_CAdv = {s = "mai" ; sNum = "mult" ; p =conjThan ; lock_CAdv = <>};
diff --git a/lib/src/spanish/StructuralSpa.gf b/lib/src/spanish/StructuralSpa.gf
index df70de138..cd90a7df7 100644
--- a/lib/src/spanish/StructuralSpa.gf
+++ b/lib/src/spanish/StructuralSpa.gf
@@ -1,5 +1,6 @@
 concrete StructuralSpa of Structural = CatSpa ** 
-  open PhonoSpa, MorphoSpa, ParadigmsSpa, BeschSpa, (X = ConstructX), Prelude in {
+  open PhonoSpa, MorphoSpa, ParadigmsSpa, BeschSpa, 
+       MakeStructuralSpa, (X = ConstructX), Prelude in {
 
   flags optimize=all ;
 
@@ -175,6 +176,8 @@ lin
   as_CAdv = X.mkCAdv "si" conjThan ; ----
    have_V2 = dirV2 (verboV (tener_4 "tener")) ;
 
+  that_Subj = {s = "que" ; m = Conjunct} ;
+
   lin language_title_Utt = ss "español" ;
 }