diff --git a/lib/src/catalan/CatCat.gf b/lib/src/catalan/CatCat.gf
index 0ea39415c..f1bbf48da 100644
--- a/lib/src/catalan/CatCat.gf
+++ b/lib/src/catalan/CatCat.gf
@@ -1,6 +1,6 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
 concrete CatCat of Cat = 
-  CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** 
+  CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** 
   CatRomance with -- JS restore TPast for notpresent
   (ResRomance = ResCat) ;
diff --git a/lib/src/catalan/GrammarCat.gf b/lib/src/catalan/GrammarCat.gf
index 59a817600..a7935fd59 100644
--- a/lib/src/catalan/GrammarCat.gf
+++ b/lib/src/catalan/GrammarCat.gf
@@ -11,7 +11,7 @@ concrete GrammarCat of Grammar =
   RelativeCat,
   ConjunctionCat,
   PhraseCat,
-  TextX - [Temp,Tense],
+  TextX - [SC,Temp,Tense],
   IdiomCat,
   StructuralCat,
   TenseCat
diff --git a/lib/src/french/CatFre.gf b/lib/src/french/CatFre.gf
index a7bfdf802..3a292c89e 100644
--- a/lib/src/french/CatFre.gf
+++ b/lib/src/french/CatFre.gf
@@ -1,5 +1,5 @@
 --# -path=.:../romance:../common:../abstract:../common:prelude
 
-concrete CatFre of Cat = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] 
+concrete CatFre of Cat = CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] 
   ** CatRomance with
   (ResRomance = ResFre) ;
diff --git a/lib/src/french/GrammarFre.gf b/lib/src/french/GrammarFre.gf
index a7f779448..c12bac844 100644
--- a/lib/src/french/GrammarFre.gf
+++ b/lib/src/french/GrammarFre.gf
@@ -11,7 +11,7 @@ concrete GrammarFre of Grammar =
   RelativeFre,
   ConjunctionFre,
   PhraseFre,
-  TextX - [Temp,Tense],
+  TextX - [SC,Temp,Tense],
   IdiomFre,
   StructuralFre,
   TenseFre
diff --git a/lib/src/italian/CatIta.gf b/lib/src/italian/CatIta.gf
index d64c6d695..13a6a2dfe 100644
--- a/lib/src/italian/CatIta.gf
+++ b/lib/src/italian/CatIta.gf
@@ -1,4 +1,4 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
-concrete CatIta of Cat = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CatRomance with
+concrete CatIta of Cat = CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CatRomance with
   (ResRomance = ResIta) ;
diff --git a/lib/src/italian/GrammarIta.gf b/lib/src/italian/GrammarIta.gf
index bf6ed9e87..1dd31bc28 100644
--- a/lib/src/italian/GrammarIta.gf
+++ b/lib/src/italian/GrammarIta.gf
@@ -11,7 +11,7 @@ concrete GrammarIta of Grammar =
   RelativeIta,
   ConjunctionIta,
   PhraseIta,
-  TextX - [Temp,Tense],
+  TextX - [SC,Temp,Tense],
   IdiomIta,
   StructuralIta,
   TenseIta
diff --git a/lib/src/romance/AdjectiveRomance.gf b/lib/src/romance/AdjectiveRomance.gf
index 03a6b1975..03aa4b5be 100644
--- a/lib/src/romance/AdjectiveRomance.gf
+++ b/lib/src/romance/AdjectiveRomance.gf
@@ -42,7 +42,7 @@ incomplete concrete AdjectiveRomance of Adjective =
       } ;
 
     SentAP ap sc = {
-      s = \\a => ap.s ! a ++ sc.s ; --- mood 
+      s = \\a => ap.s ! a ++ sc.s ! dative ; -- prête à dormir --- mood 
       isPre = False
       } ;
 
diff --git a/lib/src/romance/CatRomance.gf b/lib/src/romance/CatRomance.gf
index 3254922c0..96244a374 100644
--- a/lib/src/romance/CatRomance.gf
+++ b/lib/src/romance/CatRomance.gf
@@ -1,4 +1,4 @@
-incomplete concrete CatRomance of Cat = CommonX
+incomplete concrete CatRomance of Cat = CommonX - [SC]
   ** open Prelude, CommonRomance, ResRomance, (R = ParamX) in {
 
   flags optimize=all_subs ;
@@ -15,6 +15,7 @@ incomplete concrete CatRomance of Cat = CommonX
       c2 : Compl
       } ;
 
+    SC = {s : Case => Str} ;  -- de dormir / à dormir
 
 -- Sentence
 
diff --git a/lib/src/romance/NounRomance.gf b/lib/src/romance/NounRomance.gf
index 7c71b4d81..c2ee54ab5 100644
--- a/lib/src/romance/NounRomance.gf
+++ b/lib/src/romance/NounRomance.gf
@@ -147,7 +147,7 @@ incomplete concrete NounRomance of Noun =
       g = g
       } ;
     SentCN  cn sc = let g = cn.g in {
-      s = \\n => cn.s ! n ++ sc.s ;
+      s = \\n => cn.s ! n ++ sc.s ! genitive ;  -- raison de dormir
       g = g
       } ;
     AdvCN  cn sc = let g = cn.g in {
diff --git a/lib/src/romance/SentenceRomance.gf b/lib/src/romance/SentenceRomance.gf
index 24f27f085..3dfa76d52 100644
--- a/lib/src/romance/SentenceRomance.gf
+++ b/lib/src/romance/SentenceRomance.gf
@@ -6,7 +6,7 @@ incomplete concrete SentenceRomance of Sentence =
   lin
     PredVP np vp = mkClause (np.s ! Nom).comp np.hasClit np.isPol np.a vp ;
 
-    PredSCVP sc vp = mkClause sc.s False False (agrP3 Masc Sg) vp ;
+    PredSCVP sc vp = mkClause (sc.s ! Nom) False False (agrP3 Masc Sg) vp ;
 
     ImpVP vp = {
       s = \\p,i,g => case i of {
@@ -47,9 +47,9 @@ incomplete concrete SentenceRomance of Sentence =
        c2 = slash.c2
       } ;
 
-    EmbedS  s  = {s = conjThat ++ s.s ! Indic} ; --- mood
-    EmbedQS qs = {s = qs.s ! QIndir} ;
-    EmbedVP vp = {s = infVP vp (agrP3 Masc Sg)} ; --- agr ---- compl
+    EmbedS  s  = {s = \\_ => conjThat ++ s.s ! Indic} ; --- mood
+    EmbedQS qs = {s = \\_ => qs.s ! QIndir} ;
+    EmbedVP vp = {s = \\c => prepCase c ++ infVP vp (agrP3 Masc Sg)} ; --- agr ---- compl
 
     UseCl  t p cl = {
       s = \\o => t.s ++ p.s ++ cl.s ! DDir ! t.t ! t.a ! p.p ! o
diff --git a/lib/src/spanish/CatSpa.gf b/lib/src/spanish/CatSpa.gf
index 54b358a3e..6651c24ef 100644
--- a/lib/src/spanish/CatSpa.gf
+++ b/lib/src/spanish/CatSpa.gf
@@ -1,5 +1,5 @@
 --# -path=.:../romance:../abstract:../common:prelude
 
 concrete CatSpa of Cat = CommonX - 
-  [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CatRomance with
+  [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CatRomance with
   (ResRomance = ResSpa) ;
diff --git a/lib/src/spanish/GrammarSpa.gf b/lib/src/spanish/GrammarSpa.gf
index 1c5465dc4..299412249 100644
--- a/lib/src/spanish/GrammarSpa.gf
+++ b/lib/src/spanish/GrammarSpa.gf
@@ -11,7 +11,7 @@ concrete GrammarSpa of Grammar =
   RelativeSpa,
   ConjunctionSpa,
   PhraseSpa,
-  TextSpa - [Temp,Tense],      -- special punctuation
+  TextSpa - [SC,Temp,Tense],      -- special punctuation
   IdiomSpa,
   StructuralSpa,
   TenseSpa