diff --git a/src/belarusian/AdjectiveBel.gf b/src/belarusian/AdjectiveBel.gf
index 24fbdf420..1ea6e1a59 100644
--- a/src/belarusian/AdjectiveBel.gf
+++ b/src/belarusian/AdjectiveBel.gf
@@ -1,4 +1,4 @@
 concrete AdjectiveBel of Adjective = CatBel ** {
---lin
---  PositA a = a ;
+lin
+  PositA a = a ;
 }
diff --git a/src/belarusian/NounBel.gf b/src/belarusian/NounBel.gf
index c70c89f8d..8c208e3ef 100644
--- a/src/belarusian/NounBel.gf
+++ b/src/belarusian/NounBel.gf
@@ -1,4 +1,4 @@
 concrete NounBel of Noun = CatBel ** {
---lin
---  UseN n = n ;
+lin
+  UseN n = n ;
 }
diff --git a/src/belarusian/ResBel.gf b/src/belarusian/ResBel.gf
index 47aa55019..13aaf3994 100644
--- a/src/belarusian/ResBel.gf
+++ b/src/belarusian/ResBel.gf
@@ -157,7 +157,7 @@ oper mkA : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> A =
 oper Compl = {s : Str; c : Case} ;
 oper noPrep : Compl = {s=""; c=Acc} ;
 
-oper CommonNoun = {s : Str} ;
-oper AdjPhrase = {s : Str} ;
+oper CommonNoun = Noun ;
+oper AdjPhrase = A ;
 
 }
diff --git a/src/ukrainian/AdjectiveUkr.gf b/src/ukrainian/AdjectiveUkr.gf
index efad4049f..c92be58ba 100644
--- a/src/ukrainian/AdjectiveUkr.gf
+++ b/src/ukrainian/AdjectiveUkr.gf
@@ -1,4 +1,4 @@
 concrete AdjectiveUkr of Adjective = CatUkr ** {
---lin
---  PositA a = a ;
+lin
+  PositA a = a ;
 }
diff --git a/src/ukrainian/NounUkr.gf b/src/ukrainian/NounUkr.gf
index 1aaabb1a2..370f1a1d1 100644
--- a/src/ukrainian/NounUkr.gf
+++ b/src/ukrainian/NounUkr.gf
@@ -1,4 +1,4 @@
 concrete NounUkr of Noun = CatUkr ** {
---lin
---  UseN n = n ;
+lin
+  UseN n = n ;
 }
diff --git a/src/ukrainian/ResUkr.gf b/src/ukrainian/ResUkr.gf
index 2f8ce8317..12252abca 100644
--- a/src/ukrainian/ResUkr.gf
+++ b/src/ukrainian/ResUkr.gf
@@ -160,7 +160,7 @@ oper mkA : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> A =
 oper Compl = {s : Str; c : Case} ;
 oper noPrep : Compl = {s=""; c=Acc} ;
 
-oper CommonNoun = {s : Str} ;
-oper AdjPhrase = {s : Str} ;
+oper CommonNoun = N ;
+oper AdjPhrase = A ;
 
 }