diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1d5e21f2fd..583b3ffe32 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 2002-03-05 11:24 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
+  * source/rtl/dbsdf.prg
+    * Uncommented actual code ( forget to do it last time ), some fixes
+
+2002-03-04 11:48 UTC-0300 Horacio Roldan <harbour_ar@yahoo.com.ar>
+   * source/rdd/dbfcdx/dbfcdx1.c
+     ! fixed bug seek and set deleted on, reported by Lorenzo Fiorini
+       also fix bug with set filter
+     ! fixed bug with ordkeyno() and ordkeycount(),
+       reported by Manuel Mercado Gómez
 
 2002-03-04 22:33 UTC+0100 Antonio Linares <alinares@fivetech.com>
    * source/rtl/set.c
@@ -82,7 +91,7 @@
 2002-03-01 15:00 UTC-0500 Jorge A. Giraldo <jorgeagiraldo@emtelsa.multi.net.co>
   * contrib\delphi\hbdll\bld_sdll.bat
     * -b option ommited, people expect a DLL without DOS debugger
-	  ! fixed columns' width calc (quick and not very much tested)  
+      docs with some indications will explain this
     * some absolute paths changed to relative paths
   + contrib\delphi\hbdll\main.dfm
     + Delphi's main form, as a binary file, because it's a D3 form it will be
diff --git a/harbour/source/common/hbffind.c b/harbour/source/common/hbffind.c
index dbadb6da7b..ec140b3b49 100644
--- a/harbour/source/common/hbffind.c
+++ b/harbour/source/common/hbffind.c
@@ -169,7 +169,7 @@ USHORT hb_fsAttrFromRaw( ULONG raw_attr )
    if( raw_attr & FILE_ATTRIBUTE_NORMAL )    uiAttr |= HB_FA_NORMAL;
 
 #ifdef HB_EXTENSION
-   /* Note that FILE_ATTRIBUTE_NORMAL is not needed 
+   /* Note that FILE_ATTRIBUTE_NORMAL is not needed
       HB_FA_DEVICE not supported
       HB_FA_VOLCOMP needs to be checked */
    if( raw_attr & FILE_ATTRIBUTE_ENCRYPTED )     uiAttr |= HB_FA_ENCRYPTED;
@@ -241,7 +241,7 @@ ULONG hb_fsAttrToRaw( USHORT uiAttr )
    if( uiAttr & HB_FA_NORMAL )    raw_attr |= FILE_ATTRIBUTE_NORMAL;
 
 #ifdef HB_EXTENSION
-   /* Note that FILE_ATTRIBUTE_NORMAL is not needed 
+   /* Note that FILE_ATTRIBUTE_NORMAL is not needed
       HB_FA_DEVICE not supported
       HB_FA_VOLCOMP needs to be checked */
    if( uiAttr & HB_FA_ENCRYPTED )  raw_attr |= FILE_ATTRIBUTE_ENCRYPTED;
@@ -367,7 +367,7 @@ static void hb_fsFindFill( PHB_FFIND ffind )
 
    /* Set the default values in case some platforms don't
       support some of these, or they may fail on them. */
-   
+
    ffind->szName[ 0 ] = '\0';
 //   printf(" filename: %s",info->entry->d_name);
    ffind->size = 0;
@@ -378,7 +378,7 @@ static void hb_fsFindFill( PHB_FFIND ffind )
 #if defined(HB_OS_DOS)
 
    {
-      
+
       strncpy( ffind->szName, info->entry.ff_name, _POSIX_PATH_MAX );
       ffind->size = info->entry.ff_fsize;
 
@@ -605,6 +605,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
       if( info->hFindFile != INVALID_HANDLE_VALUE )
       {
          if( info->dwAttr == 0 ||
+           ( info->pFindFileData.dwFileAttributes == 0 ) ||
            ( info->pFindFileData.dwFileAttributes == FILE_ATTRIBUTE_NORMAL ) ||
            ( info->dwAttr & info->pFindFileData.dwFileAttributes ))
          {
@@ -617,6 +618,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
             while( FindNextFile( info->hFindFile, &info->pFindFileData ) )
             {
                if( info->dwAttr == 0 ||
+                 ( info->pFindFileData.dwFileAttributes == 0 ) ||
                  ( info->pFindFileData.dwFileAttributes == FILE_ATTRIBUTE_NORMAL ) ||
                  ( info->dwAttr & info->pFindFileData.dwFileAttributes ) )
                {
@@ -638,7 +640,7 @@ PHB_FFIND hb_fsFindFirst( const char * pszFileName, USHORT uiAttr )
 
       char     dirname[ _POSIX_PATH_MAX + 1 ];
 
-    
+
       char *   pos;
       ffind->info = ( void * ) hb_xgrab( sizeof( HB_FFIND_INFO ) );
       info = ( PHB_FFIND_INFO ) ffind->info;
@@ -745,6 +747,7 @@ BOOL hb_fsFindNext( PHB_FFIND ffind )
       while( FindNextFile( info->hFindFile, &info->pFindFileData ) )
       {
          if( info->dwAttr == 0 ||
+             ( info->pFindFileData.dwFileAttributes == 0 ) ||
              ( info->pFindFileData.dwFileAttributes == FILE_ATTRIBUTE_NORMAL ) ||
              ( info->dwAttr & info->pFindFileData.dwFileAttributes ))
          {
diff --git a/harbour/source/rtl/persist.prg b/harbour/source/rtl/persist.prg
index 2d0bde1d79..01b06bf266 100644
--- a/harbour/source/rtl/persist.prg
+++ b/harbour/source/rtl/persist.prg
@@ -71,7 +71,7 @@ ENDCLASS
 
 METHOD LoadFromText( cObjectText ) CLASS HBPersistent
 
-   local nLines := MLCount( cObjectText )
+   local nLines := MLCount( cObjectText, 254 )
    local nLine  := 1, cLine, cToken
    local lStart := .t., aArray
    private oSelf
@@ -83,7 +83,6 @@ METHOD LoadFromText( cObjectText ) CLASS HBPersistent
    while Empty( MemoLine( cObjectText,, nLine ) ) // We skip the first empty lines
       nLine++
    end
-
    while nLine <= nLines
       cLine  := MemoLine( cObjectText, 254, nLine )