diff --git a/src/GF/Canon/CanonToGFCC.hs b/src/GF/Canon/CanonToGFCC.hs
index 52488148c..20824a23d 100644
--- a/src/GF/Canon/CanonToGFCC.hs
+++ b/src/GF/Canon/CanonToGFCC.hs
@@ -138,7 +138,7 @@ optConcrete defs = subex [C.Lin f (optTerm t) | C.Lin f t <- defs]
 -- suffix sets can later be shared by subex elim
 optTerm :: C.Term -> C.Term  
 optTerm tr = case tr of
-    C.R ts@(_:_) | all isK ts -> mkSuff $ optToks [s | C.K (C.KS s) <- ts]
+    C.R ts@(_:_:_) | all isK ts -> mkSuff $ optToks [s | C.K (C.KS s) <- ts]
     C.R ts  -> C.R $ map optTerm ts
     C.P t v -> C.P (optTerm t) v
     _ -> tr
diff --git a/src/GF/UseGrammar/Linear.hs b/src/GF/UseGrammar/Linear.hs
index 260bfb9a2..85bae5b0d 100644
--- a/src/GF/UseGrammar/Linear.hs
+++ b/src/GF/UseGrammar/Linear.hs
@@ -153,7 +153,7 @@ unoptimizeCanonMod g = convMod where
       ps  <- mapM term2patt vs
       return $ T ty [Cas [p] t | (p,t) <- zip ps ts]
     FV ts -> liftM FV $ mapM exp ts
-    I _ -> comp t
+    I _   -> comp t
     _ -> composOp exp t
    where
      alls = allParamValues g