diff --git a/src/croatian/ResHrv.gf b/src/croatian/ResHrv.gf
index 17dc337c..de749092 100644
--- a/src/croatian/ResHrv.gf
+++ b/src/croatian/ResHrv.gf
@@ -391,7 +391,7 @@ adjFormsAdjective : AdjForms -> Adjective = \afs -> {
                   (velk + "o") ;
       msgen   = velk + "og" ;
       fsgen   = velk + "e" ;
-      msdat   = velk + "omu" ;
+      msdat   = velk + "om" ;
       fsdat   = velk + "oj" ;
       fsacc   = velk + "u" ;
       msloc   = velk + "om" ;
diff --git a/src/croatian/StructuralHrv.gf b/src/croatian/StructuralHrv.gf
index 4b034457..d0690d89 100644
--- a/src/croatian/StructuralHrv.gf
+++ b/src/croatian/StructuralHrv.gf
@@ -15,8 +15,8 @@ lin
 ----    somePl_Det = {s = \\g,c => (demPronFormsAdjective (mkDemPronForms "niekoľko") "").s ! g ! Pl ! c ; size = Num5} ;
 ----    something_NP = {s,clit,prep = \\c => "nie" + coForms ! c ; a = Ag Neutr Sg P3 ; hasClit = False} ; -- CEG 5.6.3
     possess_Prep = mkPrep "" Gen ;
-----    that_Quant = demPronFormsAdjective (tenDemPronForms "") "" ;
-----    this_Quant = demPronFormsAdjective (tenDemPronForms "" ** {msgen = "toh"}) "to" ;
+    that_Quant = adjFormsAdjective (velikA "oni" ** {msnom = "onaj"}) ; ---- TODO: taj, ta, to
+    this_Quant = adjFormsAdjective (velikA "ovi" ** {msnom = "ovaj"}) ;
     to_Prep = mkPrep "u" Acc ;
     with_Prep = mkPrep (pre {"s"|"z"|"š"|"ž"|"mnom" => "sa" ; _ => "s"}) Ins ; 
 
diff --git a/src/croatian/SymbolHrv.gf b/src/croatian/SymbolHrv.gf
index f528016c..9c5b9c4f 100644
--- a/src/croatian/SymbolHrv.gf
+++ b/src/croatian/SymbolHrv.gf
@@ -8,8 +8,8 @@ lin
   MkSymb s = s ;
   SymbPN s = lin PN {s = \\_ => s.s ; g = Neutr} ;
 
---AW SymbolEng.IntPN
---AW SymbolEng.SymbNum
---AW SymbolicEng.mkSymb
+  IntPN s = lin PN {s = \\_ => s.s ; g = Neutr} ;
+
+  SymbNum s = lin Card {s = \\_,_ => s.s ; size = NS_20_} ; --- size
 
 }