diff --git a/lcode.c b/lcode.c
index 51fe877d..32a56d14 100644
--- a/lcode.c
+++ b/lcode.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lcode.c,v 1.93 2002/03/25 17:47:14 roberto Exp roberto $
+** $Id: lcode.c,v 1.94 2002/04/02 20:34:53 roberto Exp roberto $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
@@ -173,7 +173,7 @@ void luaK_concat (FuncState *fs, int *l1, int l2) {
 }
 
 
-void luaK_checkstack (FuncState *fs, int n) {
+static void luaK_checkstack (FuncState *fs, int n) {
   int newstack = fs->freereg + n;
   if (newstack > fs->f->maxstacksize) {
     if (newstack >= MAXSTACK)
diff --git a/lcode.h b/lcode.h
index 4bc50c51..57ceb662 100644
--- a/lcode.h
+++ b/lcode.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lcode.h,v 1.29 2002/03/21 20:31:43 roberto Exp roberto $
+** $Id: lcode.h,v 1.30 2002/04/02 20:34:53 roberto Exp roberto $
 ** Code generator for Lua
 ** See Copyright Notice in lua.h
 */
@@ -45,7 +45,6 @@ void luaK_error (LexState *ls, const char *msg);
 int luaK_codeABc (FuncState *fs, OpCode o, int A, unsigned int Bc);
 int luaK_codeABC (FuncState *fs, OpCode o, int A, int B, int C);
 void luaK_nil (FuncState *fs, int from, int n);
-void luaK_checkstack (FuncState *fs, int n);
 void luaK_reserveregs (FuncState *fs, int n);
 int luaK_stringK (FuncState *fs, TString *s);
 int luaK_numberK (FuncState *fs, lua_Number r);
diff --git a/ldo.c b/ldo.c
index b0a0bd25..7df80b19 100644
--- a/ldo.c
+++ b/ldo.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ldo.c,v 1.167 2002/03/25 19:45:06 roberto Exp roberto $
+** $Id: ldo.c,v 1.168 2002/03/26 20:46:10 roberto Exp roberto $
 ** Stack and Call structure of Lua
 ** See Copyright Notice in lua.h
 */
@@ -161,6 +161,7 @@ static void luaD_callHook (lua_State *L, lua_Hook callhook, const char *event) {
     ar.event = event;
     ar.i_ci = L->ci - L->base_ci;
     L->ci->pc = NULL;  /* function is not active */
+    L->ci->top = L->ci->base;  /* `top' may not have a valid value yet */ 
     dohook(L, &ar, callhook);
   }
 }
@@ -208,7 +209,7 @@ StkId luaD_precall (lua_State *L, StkId func) {
   LClosure *cl;
   if (++L->ci == L->end_ci) luaD_growCI(L);
   ci = L->ci;
-  ci->base = ci->top = func+1;  /* pre-init `top' in case of errors */
+  ci->base = func+1;
   ci->pc = NULL;
   if (ttype(func) != LUA_TFUNCTION) /* `func' is not a function? */
     func = tryfuncTM(L, func);  /* check the `function' tag method */
diff --git a/lopcodes.c b/lopcodes.c
index bbe66717..ac82dae2 100644
--- a/lopcodes.c
+++ b/lopcodes.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lopcodes.c,v 1.14 2002/03/25 17:47:14 roberto Exp roberto $
+** $Id: lopcodes.c,v 1.15 2002/04/09 19:47:44 roberto Exp roberto $
 ** extracted automatically from lopcodes.h by mkprint.lua
 ** DO NOT EDIT
 ** See Copyright Notice in lua.h
@@ -49,7 +49,7 @@ const char *const luaP_opnames[] = {
   "RETURN",
   "FORLOOP",
   "TFORLOOP",
-  "OP_TFORPREP",
+  "TFORPREP",
   "SETLIST",
   "SETLISTO",
   "CLOSE",