diff --git a/lib/src/slovenian/AdjectiveSlv.gf b/lib/src/slovenian/AdjectiveSlv.gf
index b42b77e10..ae7f854cb 100644
--- a/lib/src/slovenian/AdjectiveSlv.gf
+++ b/lib/src/slovenian/AdjectiveSlv.gf
@@ -4,16 +4,16 @@ concrete AdjectiveSlv of Adjective = CatSlv ** open ResSlv in {
     PositA a = {
       s = \\spec,g,c,n => 
         case <spec,g,n,c> of {
-          <Def,Masc,Sg,Nom> => a.s ! APositDefNom ;
-          <Def,Masc,Sg,Acc> => a.s ! APositDefAcc ;
-          _                 => a.s ! APosit g n c
+          <Def,AMasc _,    Sg,Nom> => a.s ! APositDefNom ;
+          <_,AMasc Animate,Sg,Acc> => a.s ! APosit Masc Sg Gen ;
+          _                        => a.s ! APosit (agender2gender g) n c
         }
       } ;
     UseComparA a = {
       s = \\spec,g,c,n => 
         case <spec,g,n,c> of {
-          <Def,Masc,Sg,Acc> => a.s ! AComparDefAcc ;
-          _                 => a.s ! ACompar g n c
+          <Def,AMasc _,Sg,Acc> => a.s ! AComparDefAcc ;
+          _                    => a.s ! ACompar (agender2gender g) n c
         }
       } ;
 
diff --git a/lib/src/slovenian/CatSlv.gf b/lib/src/slovenian/CatSlv.gf
index 81b77aec2..4bb2711e3 100644
--- a/lib/src/slovenian/CatSlv.gf
+++ b/lib/src/slovenian/CatSlv.gf
@@ -14,7 +14,7 @@ lincat
   Comp = {s : Agr => Str} ; 
 
   -- Adjective
-  AP = {s : Species => Gender => Case => Number => Str} ;
+  AP = {s : Species => AGender => Case => Number => Str} ;
 
   -- Noun
   CN = {s : Species => Case => Number => Str; g : AGender} ;
diff --git a/lib/src/slovenian/ConjunctionSlv.gf b/lib/src/slovenian/ConjunctionSlv.gf
index 85c4300f5..b866ad4d1 100644
--- a/lib/src/slovenian/ConjunctionSlv.gf
+++ b/lib/src/slovenian/ConjunctionSlv.gf
@@ -30,6 +30,6 @@ concrete ConjunctionSlv of Conjunction =
 
   lincat
     [NP] = {s1,s2 : Case => Str; a : Agr} ;
-    [AP] = {s1,s2 : Species => Gender => Case => Number => Str} ;
+    [AP] = {s1,s2 : Species => AGender => Case => Number => Str} ;
 
 }
diff --git a/lib/src/slovenian/NounSlv.gf b/lib/src/slovenian/NounSlv.gf
index 5b170ce26..09e46624f 100644
--- a/lib/src/slovenian/NounSlv.gf
+++ b/lib/src/slovenian/NounSlv.gf
@@ -59,7 +59,7 @@ concrete NounSlv of Noun = CatSlv ** open ResSlv in {
     UseN n = {s = \\_ => n.s; g = n.g} ;
 
     AdjCN ap cn = {
-      s = \\spec,c,n => ap.s ! spec ! agender2gender cn.g ! c ! n ++ cn.s ! Indef ! c ! n ;
+      s = \\spec,c,n => ap.s ! spec ! cn.g ! c ! n ++ cn.s ! Indef ! c ! n ;
       g = cn.g
       } ;
     AdvCN cn ad = {s = \\spec,c,n => cn.s ! spec ! c ! n ++ ad.s ; g = cn.g} ;
diff --git a/lib/src/slovenian/PhraseSlv.gf b/lib/src/slovenian/PhraseSlv.gf
index 783d7ad26..2add861c7 100644
--- a/lib/src/slovenian/PhraseSlv.gf
+++ b/lib/src/slovenian/PhraseSlv.gf
@@ -14,7 +14,7 @@ concrete PhraseSlv of Phrase = CatSlv ** open Prelude, ResSlv in {
     UttAdv adv = adv ;
     UttCN n = {s = n.s ! Indef ! Nom ! Sg} ;
     UttCard n = {s = n.s ! Fem ! Nom} ;
-    UttAP ap = {s = ap.s ! Indef ! Masc ! Nom ! Sg} ;
+    UttAP ap = {s = ap.s ! Indef ! AMasc Inanimate ! Nom ! Sg} ;
     UttInterj i = i ;
 
     NoPConj = {s = []} ;