--- ./extensions/sfext/formula/FTYPEINFO.c.orig	2012-03-16 06:49:31.000000000 -0600
+++ ./extensions/sfext/formula/FTYPEINFO.c	2013-08-30 15:48:28.420527430 -0600
@@ -23,6 +23,6 @@ Word FTYPEINFO(Word A)
     return TRUE;
   if (FIRST(A) == FALSE)
     return FALSE;
-  
+  FAIL("FTYPEINFO","Unknown formula type!"); 
 }
       
--- ./source/qepcad.h.orig	2013-08-30 14:39:10.225632400 -0600
+++ ./source/qepcad.h	2013-08-30 16:17:46.258481805 -0600
@@ -34,7 +34,7 @@ Word AFPNIPDB(Word Mb, Word B);
 void AFUPGCDB(Word M, Word A, Word B, Word *C_, Word *Ab_, Word *Bb_);
 void AFUPLM(Word M, Word A, Word *L_, Word *P_);
 void AFUPRWR(Word a, Word v, Word A, Word I);
-Word AFUPSFNDB(Word M, Word B, Word *t_, Word *Bt_, Word *F_);
+void AFUPSFNDB(Word M, Word B, Word *t_, Word *Bt_, Word *F_);
 Word APPEND(Word P, Word k, Word R);
 void APPENDEC(Word P, Word k, Word R, Word *Ps_, Word *F_);
 void ATOMFLWR(Word N, Word V, Word A);
--- ./source/db/AFUPSFNDB.c.orig	2012-03-16 06:49:30.000000000 -0600
+++ ./source/db/AFUPSFNDB.c	2013-08-30 16:18:05.419450506 -0600
@@ -5,7 +5,7 @@ AFUPSFN with Database.
 ======================================================================*/
 #include "qepcad.h"
 
-Word AFUPSFNDB(Word M, Word B, Word *t_, Word *Bt_, Word *F_)
+void AFUPSFNDB(Word M, Word B, Word *t_, Word *Bt_, Word *F_)
 {
        Word t,Bt,F;
 
--- ./source/db/SingSacPolicy.h.orig	2012-03-16 06:49:30.000000000 -0600
+++ ./source/db/SingSacPolicy.h	2013-08-30 16:20:40.923189610 -0600
@@ -28,17 +28,17 @@ public:
   Word IPRES(Word r, Word A, Word B)
   {
     if (r > 2)
-      sing->IPRES(r,A,B);
+      return sing->IPRES(r,A,B);
     else
-      sac ->IPRES(r,A,B);
+      return sac ->IPRES(r,A,B);
   }
 
   Word IPDSCR(Word r, Word A)
   {
     if (r > 2)
-      sing->IPDSCR(r,A);
+      return sing->IPDSCR(r,A);
     else
-      sac ->IPDSCR(r,A);
+      return sac ->IPDSCR(r,A);
   }
 
   Word IPFACTGB(Word r, Word I, Word N)