diff --git a/src/fst/morphology/affixes/adjectives.lexc b/src/fst/morphology/affixes/adjectives.lexc
index 93c7ffe782..c5515466ec 100644
--- a/src/fst/morphology/affixes/adjectives.lexc
+++ b/src/fst/morphology/affixes/adjectives.lexc
@@ -1782,8 +1782,8 @@ LEXICON GAPPUS0 !!≈ * **@CODE@** Almost id. to MALIS0. MALIS0 has no VUOHTA, G
  +Ess:in%> NPxC ;
 
 
-LEXICON GAPPUS- !!≈ * **@CODE@**
- MALLAS- ; ! should be flipped with the rest.
+!LEXICON GAPPUS- !!≈ * **@CODE@** (not in use)
+! MALLAS- ; ! should be flipped with the rest.
 
 !! GOAL: Keep GAPPUS- and MALLAS- apart, because of
 !! the Px(1)V issue, but unify the rest.
diff --git a/src/fst/morphology/affixes/nouns.lexc b/src/fst/morphology/affixes/nouns.lexc
index 13360aa88f..a59c4c0f98 100644
--- a/src/fst/morphology/affixes/nouns.lexc
+++ b/src/fst/morphology/affixes/nouns.lexc
@@ -38,9 +38,9 @@ LEXICON GOAHTI-I  !!≈ * **@CODE@** divided into a-i-u due to errortag-branch
 LEXICON GOAHTI-U  !!≈ * **@CODE@** divided into a-i-u due to errortag-branch
  GOAHTI-IU ;
  +Err/Orth:%> GOAHTILONGCMP ;
- +Sg+Gen:  NPx12VvowchD ; !Err/Orth for difphtong
- +Sg+Acc:  NPx12VvowchD ; !Err/Orth for difphtong
- +Sg+Nom:  NPx12VvowchD ; !Err/Orth for difphtong
+ +Sg+Gen:  NPx12VvowchDIPH ; !Err/Orth for difphtong
+ +Sg+Acc:  NPx12VvowchDIPH ; !Err/Orth for difphtong
+ +Sg+Nom:  NPx12VvowchDIPH ; !Err/Orth for difphtong
 
 
 
diff --git a/src/fst/morphology/affixes/verbs.lexc b/src/fst/morphology/affixes/verbs.lexc
index d132dd1f06..f9d4d84fac 100644
--- a/src/fst/morphology/affixes/verbs.lexc
+++ b/src/fst/morphology/affixes/verbs.lexc
@@ -91,9 +91,9 @@ LEXICON DIEVVA_IV  !!≈ * **@CODE@**  Bisyllabic a-verbs without Personal Passi
  +V+IV: DIEVVA-VERB ;
  +V+IV+PrfPrc+Err/Orth-a-á:Q1n K ; !dievván
 
-LEXICON SUHKA_IV  !!≈ * **@CODE@**  Bisyllabic a-verbs without Personal Passive but with Der/NomAg, monophthong
- +V+IV: DIEVVA-VERB ;
- +V+IV+PrfPrc+Err/Orth-a-á:Q1n K ; !suhkán
+!LEXICON SUHKA_IV  !!≈ * **@CODE@**  Bisyllabic a-verbs without Personal Passive but with Der/NomAg, monophthong (not in use)
+! +V+IV: DIEVVA-VERB ;
+! +V+IV+PrfPrc+Err/Orth-a-á:Q1n K ; !suhkán
 
 LEXICON DIEVVA-VERB  !!≈ * **@CODE@**  Bisyllabic a- and u-verbs without Personal Passive but with Der/NomAg, diphthong
  :%> BOAHTIStem ;
@@ -918,8 +918,8 @@ DeverbalNounsBAHCCI ;
  BOAHTICnj ;
 
 
-LEXICON AT_IV_CGforms
- +V+IV: AT_CGforms ;
+!LEXICON AT_IV_CGforms (not in use)
+! +V+IV: AT_CGforms ;
 
 LEXICON AT_TV_CGforms
  +V+TV: AT_CGforms ;