diff --git a/lib/resource-1.0/finnish/ParadigmsFin.gf b/lib/resource-1.0/finnish/ParadigmsFin.gf
index 4d6ca939d..df83ed1f9 100644
--- a/lib/resource-1.0/finnish/ParadigmsFin.gf
+++ b/lib/resource-1.0/finnish/ParadigmsFin.gf
@@ -108,9 +108,10 @@ oper
 
   nKukko : (kukko,kukon,kukkoja : Str) -> N ;
 
--- A special case are nouns with no alternations: 
+-- A special case:
 -- the vowel harmony is inferred from the last letter,
--- which must be one of "o", "u", "ö", "y".
+-- which must be one of "o", "u", "ö", "y". Regular weak-grade alternation
+-- is performed.
 
   nTalo : (talo : Str) -> N ;
 
@@ -357,7 +358,8 @@ oper
     \c,p -> {c = NPCase c ; s = p ; isPre = True ; lock_Prep = <>} ;
   postPrep : Case -> Str -> Prep =
     \c,p -> {c = NPCase c ; s = p ; isPre = False ; lock_Prep = <>} ;
-  postGenPrep p = {c = NPCase genitive ; s = p ; isPre = False ; lock_Prep = <>} ;
+  postGenPrep p = {
+    c = NPCase genitive ; s = p ; isPre = False ; lock_Prep = <>} ;
   casePrep : Case -> Prep =
     \c -> {c = NPCase c ; s = [] ; isPre = True ; lock_Prep = <>} ;
   accPrep =  {c = NPAcc ; s = [] ; isPre = True ; lock_Prep = <>} ;
diff --git a/src/GF/Canon/GFCC/DataGFCC.hs b/src/GF/Canon/GFCC/DataGFCC.hs
index ea21ce6c6..389afc5a7 100644
--- a/src/GF/Canon/GFCC/DataGFCC.hs
+++ b/src/GF/Canon/GFCC/DataGFCC.hs
@@ -88,7 +88,7 @@ compute mcfg lang args = comp where
 
   look = lookLin mcfg lang
 
-  idx xs i = xs !! i 
+  idx xs i = if i > length xs - 1 then trace "overrun !!\n" (last xs) else xs !! i 
 
   proj r p = case (r,p) of
     (_,     FV ts) -> FV $ Prelude.map (proj r) ts
diff --git a/src/GF/Canon/GFCC/GenGFCC.hs b/src/GF/Canon/GFCC/GenGFCC.hs
index 00821cceb..f1d4e8923 100644
--- a/src/GF/Canon/GFCC/GenGFCC.hs
+++ b/src/GF/Canon/GFCC/GenGFCC.hs
@@ -43,6 +43,7 @@ generateRandom gen gfcc cat = genTrees (randomRs (0.0, 1.0) gen) cat where
     gett ds (CId "Int")    = (Tr (AI 12345) [], 1)
     gett [] _ = (Tr (AS "TIMEOUT") [], 1) ----
     gett ds cat = case fns cat of
+      [] -> (Tr AM [],1)
       fs -> let 
           d:ds2    = ds
           (f,args) = getf d fs
diff --git a/src/Makefile b/src/Makefile
index 7d0a7f42c..7c13d043c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -180,7 +180,7 @@ tools/$(GF_DOC_EXE): tools/GFDoc.hs
 gfcc:
 	$(GHMAKE) $(GHCOPTFLAGS) -o gfcc GF/Canon/GFCC/RunGFCC.hs
 	strip gfcc
-
+	mv gfcc ../bin/
 #
 # Distribution
 #