diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3445e4972d..60bcbf8945 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -11,6 +11,12 @@
 2002-01-17 15:32 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   * source/rdd/dbfntx/dbfntx1.c
   * include/hbrddntx.h
+    * FOR condition support implemented ( DBFNTX )
+
+2002-01-16 00:14 UTC+0100 Maurilio Longo <maurilio.longo@libero.it>
+  * common/hbgete.c
+    ! fixed warning on DosScanEnv() call
+
 2002-01-16 17:21 UTC-0300 Horacio Roldan <harbour_ar@yahoo.com.ar>
    * source/rdd/dbfcdx1.c
      * fixed some simple warnings by bcc32 (with -w)
@@ -453,13 +459,13 @@
      + Added function sx_CreateField()
      + Added function sx_Eof()
      + Added function sx_GetString()
-       #ifndef HB_OS_WIN_32 to 
+     + Added function sx_GoTop()
      + Added function sx_IndexTag()
      + Added function sx_RecNo()
-       IMPORTANT: For those who get duplicate defines when compiling 
-       Win32 code, the #define HB_OS_WIN_32_USED should be defined 
+     + Added function sx_Replace()
+     + Added function sx_Skip()
      + Added function sx_Use()
-      
+     + Added function sx_Zap()
    * contrib/apollo/test
      * Added functions in a test application.
 
diff --git a/harbour/source/common/hbffind.c b/harbour/source/common/hbffind.c
index d19a829ae6..6ca3c8a8c5 100644
--- a/harbour/source/common/hbffind.c
+++ b/harbour/source/common/hbffind.c
@@ -86,6 +86,7 @@ HB_FILE_VER( "$Id$" )
 
 #elif defined(HB_OS_OS2)
 
+   #include <sys/types.h>
    #include <sys/stat.h>
    #include <time.h>
 
@@ -576,6 +577,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
       tzset();
 
       info->hFindFile = HDIR_CREATE;
+      info->findCount = 1;
 
       bFound = DosFindFirst( pszFileName,
                              &info->hFindFile,
@@ -673,7 +675,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
             strcpy( info->pfname, string );
          }
          else
-	 {
+    {
             strcpy( info->pfname, string );
             info->pfext[ 0 ] = '\0';
          }