diff --git a/src/russian/LexiconRus.gf b/src/russian/LexiconRus.gf
index 1fd7f6b13..ac61cd276 100644
--- a/src/russian/LexiconRus.gf
+++ b/src/russian/LexiconRus.gf
@@ -11,7 +11,7 @@ lin
   animal_N = mkN "животное" animate;
   answer_V2S = dirV2 (regV imperfective first "отвеча" "ю" "отвечал" "отвечай" "отвечать" );
   apartment_N = mkN "квартира" ;
-  apple_N = mkN "яблоко" ;
+  apple_N = mkN "яблоко" inanimate ;
   art_N = mkN "искусство" ;
   ashes_N = mkN "пепел" ;
   ask_V2Q = dirV2 (regV imperfective first "спрашива" "ю" "спрашивал" "спрашивай" "спрашивать") ;
@@ -22,7 +22,7 @@ lin
   bark_N = mkN "кора";
   beautiful_A = mkA "красивый";
   become_VA = regV perfective second "станов" "лю" "стал" "стань" "стать" ;
-  beer_N = mkN "пиво" ;
+  beer_N = mkIndeclinableNoun "пиво" neuter inanimate ;
   beg_V2V = dirV2 (mkV imperfective "прошу" "просишь" "просит" "просим" "просите" "просят" "просил" "проси" "просить" );
   belly_N = mkN "живот" ;
   big_A = mkA "большой" "больше" ;
diff --git a/src/russian/NounRus.gf b/src/russian/NounRus.gf
index f865a1157..354071789 100644
--- a/src/russian/NounRus.gf
+++ b/src/russian/NounRus.gf
@@ -8,13 +8,8 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
     DetCN kazhduj okhotnik = {
       s = \\c => case kazhduj.size of {
 	nom =>
-	  case kazhduj.c of {
-	    Nom => 
               kazhduj.s ! AF (extCase c) okhotnik.anim (gennum okhotnik.g kazhduj.n) ++ 
-              okhotnik.s ! NF kazhduj.n (extCase c) nom ; 
-	    _ => 
-              kazhduj.s ! AF (extCase c) okhotnik.anim (gennum okhotnik.g kazhduj.n) ++ 
-              okhotnik.s ! NF kazhduj.n kazhduj.c nom } ;
+              okhotnik.s ! NF kazhduj.n (extCase c) nom  ;
 	sgg =>
 	  case kazhduj.c of {
 	    Nom => 
@@ -155,7 +150,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in {
     PossPron p = {s = \\af => p.s ! mkPronForm (caseAF af) No (Poss (gennum (genAF af) (numAF af) )); c=Nom; g = PNoGen; size = nom} ;
 
    NumCard c = c ;
-   NumSg = {s = \\_,_,_ => [] ; n = Sg ; size = sgg} ;
+   NumSg = {s = \\_,_,_ => [] ; n = Sg ; size = nom} ;
    NumPl = {s = \\_,_,_ => [] ; n = Pl ; size = plg} ;
 
    OrdNumeral numeral = variants {} ; ---- TODO; needed to compile Constructors