diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile
index 6de4e3e38..fd8153e9a 100644
--- a/lib/resource-1.0/Makefile
+++ b/lib/resource-1.0/Makefile
@@ -73,8 +73,8 @@ present:
 	$(GFCP) common/ConstructX.gf
 	mv */*.gfc */*.gfr ../present
 	touch api/Constructors.gf
-	$(GFCCP) api/Constructors???.gf
-	mv api/Constructors*.gfc api/Constructors*.gfr ../alltenses
+	$(GFCCP) -path=api:present:prelude api/Constructors???.gf
+	mv api/Constructors*.gfc api/Constructors*.gfr ../present
 
 mathematical:
 	$(GFCC) mathematical/MathematicalEng.gf
diff --git a/src/GF/Grammar/Compute.hs b/src/GF/Grammar/Compute.hs
index 1b4693932..2f55babd4 100644
--- a/src/GF/Grammar/Compute.hs
+++ b/src/GF/Grammar/Compute.hs
@@ -134,7 +134,7 @@ computeTermOpt rec gr = comp where
            ts' <- mapM (comp g . S t) vs
            return $ variants ts' 
          _ -> case ti of
-
+{-
            TComp _  -> do
              case term2patt v' of
                Ok p' -> case lookup p' cc of
@@ -145,7 +145,7 @@ computeTermOpt rec gr = comp where
                _ -> do
                   t' <- comp g t
                   return $ S t' v'
-
+-}
            _ -> case matchPattern cc v' of
              Ok (c,g') -> comp (g' ++ g) c
              _ | isCan v' -> prtBad ("missing case" +++ prt v' +++ "in") t 
@@ -158,7 +158,7 @@ computeTermOpt rec gr = comp where
 
       t'     <- case t of
 --        T _ _ -> return t
-        V _ _ -> return t
+--        V _ _ -> return t
         _ -> comp g t
 
       v'     <- comp g v