diff --git a/fallback.c b/fallback.c
index 7fff6690..fd9bd648 100644
--- a/fallback.c
+++ b/fallback.c
@@ -3,7 +3,7 @@
 ** TecCGraf - PUC-Rio
 */
  
-char *rcs_fallback="$Id: fallback.c,v 1.11 1995/02/06 19:34:03 roberto Exp roberto $";
+char *rcs_fallback="$Id: fallback.c,v 1.12 1995/05/02 18:43:03 roberto Exp roberto $";
 
 #include <stdio.h>
 #include <string.h>
@@ -28,15 +28,15 @@ static void funcFB (void);
 ** Warning: This list must be in the same order as the #define's
 */
 struct FB  luaI_fallBacks[] = {
-{"error", {LUA_T_CFUNCTION, errorFB}},
-{"index", {LUA_T_CFUNCTION, indexFB}},
-{"gettable", {LUA_T_CFUNCTION, gettableFB}},
-{"arith", {LUA_T_CFUNCTION, arithFB}},
-{"order", {LUA_T_CFUNCTION, orderFB}},
-{"concat", {LUA_T_CFUNCTION, concatFB}},
-{"settable", {LUA_T_CFUNCTION, gettableFB}},
-{"gc", {LUA_T_CFUNCTION, GDFB}},
-{"function", {LUA_T_CFUNCTION, funcFB}}
+{"error", {LUA_T_CFUNCTION, {errorFB}}},
+{"index", {LUA_T_CFUNCTION, {indexFB}}},
+{"gettable", {LUA_T_CFUNCTION, {gettableFB}}},
+{"arith", {LUA_T_CFUNCTION, {arithFB}}},
+{"order", {LUA_T_CFUNCTION, {orderFB}}},
+{"concat", {LUA_T_CFUNCTION, {concatFB}}},
+{"settable", {LUA_T_CFUNCTION, {gettableFB}}},
+{"gc", {LUA_T_CFUNCTION, {GDFB}}},
+{"function", {LUA_T_CFUNCTION, {funcFB}}}
 };
 
 #define N_FB  (sizeof(luaI_fallBacks)/sizeof(struct FB))
diff --git a/mathlib.c b/mathlib.c
index dc3bc762..5f87a7fb 100644
--- a/mathlib.c
+++ b/mathlib.c
@@ -3,7 +3,7 @@
 ** Mathematics library to LUA
 */
 
-char *rcs_mathlib="$Id: mathlib.c,v 1.8 1995/01/04 18:49:54 roberto Exp $";
+char *rcs_mathlib="$Id: mathlib.c,v 1.9 1995/02/06 19:36:43 roberto Exp roberto $";
 
 #include <stdio.h>		/* NULL */
 #include <math.h>
@@ -11,7 +11,9 @@ char *rcs_mathlib="$Id: mathlib.c,v 1.8 1995/01/04 18:49:54 roberto Exp $";
 #include "lualib.h"
 #include "lua.h"
 
+#ifndef PI
 #define PI          3.14159265358979323846
+#endif
 #define TODEGREE(a) ((a)*180.0/PI)
 #define TORAD(a)    ((a)*PI/180.0)
 
diff --git a/opcode.c b/opcode.c
index fe5c6dfc..d68db2ad 100644
--- a/opcode.c
+++ b/opcode.c
@@ -3,7 +3,7 @@
 ** TecCGraf - PUC-Rio
 */
 
-char *rcs_opcode="$Id: opcode.c,v 3.37 1995/05/02 18:43:03 roberto Exp roberto $";
+char *rcs_opcode="$Id: opcode.c,v 3.38 1995/05/16 17:23:58 roberto Exp roberto $";
 
 #include <setjmp.h>
 #include <stdlib.h>
@@ -446,7 +446,7 @@ int lua_dostring (char *string)
 */
 lua_Object lua_setfallback (char *name, lua_CFunction fallback)
 {
-  static Object func = {LUA_T_CFUNCTION, luaI_setfallback};
+  static Object func = {LUA_T_CFUNCTION, {luaI_setfallback}};
   adjustC(0);
   lua_pushstring(name);
   lua_pushcfunction(fallback);