diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fd4420414d..a90addc1d7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,12 @@
    For example:
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+2002-01-08 12:31 UTC+0700 Andi Jahja <harbour@cbn.net.id>
+   * source/rdd/dbfcdx/dbfcdx1.c
+     ! remove spurious type casts
+
+2002-01-07 19:40 UTC-0300 Luiz Rafael Culik <culik@sl.conex.net>
+   * source/common/hbffind.c
      * Minor fix to Win32 branch
    * include/hbapifs.h
      * Added HB_FA_NORMAL
diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h
index 7af8a7657a..1cb02de8d4 100644
--- a/harbour/include/hbapifs.h
+++ b/harbour/include/hbapifs.h
@@ -96,6 +96,7 @@ typedef int    FHANDLE;
 #define HB_FA_NOTINDEXED        4096
 #define HB_FA_ENCRYPTED         8192
 #define HB_FA_VOLCOMP           16384   /* volume supports compression. */
+#define HB_FA_NORMAL            HB_FA_ALL
 
 extern BOOL     hb_fsChDir      ( BYTE * pszDirName ); /* change working directory */
 extern USHORT   hb_fsChDrv      ( BYTE nDrive ); /* change working drive */
diff --git a/harbour/source/common/hbffind.c b/harbour/source/common/hbffind.c
index ea1b282903..fb6170e1b5 100644
--- a/harbour/source/common/hbffind.c
+++ b/harbour/source/common/hbffind.c
@@ -161,7 +161,7 @@ USHORT hb_fsAttrFromRaw( ULONG raw_attr )
    if( raw_attr & FILE_ATTRIBUTE_HIDDEN )    uiAttr |= HB_FA_HIDDEN;
    if( raw_attr & FILE_ATTRIBUTE_READONLY )  uiAttr |= HB_FA_READONLY;
    if( raw_attr & FILE_ATTRIBUTE_SYSTEM )    uiAttr |= HB_FA_SYSTEM;
-
+   if( raw_attr & FILE_ATTRIBUTE_NORMAL )    uiAttr |= HB_FA_NORMAL;
 #elif defined(HB_OS_UNIX)
 
    uiAttr = 0;
@@ -216,7 +216,7 @@ ULONG hb_fsAttrToRaw( USHORT uiAttr )
    if( uiAttr & HB_FA_HIDDEN )    raw_attr |= FILE_ATTRIBUTE_HIDDEN;
    if( uiAttr & HB_FA_READONLY )  raw_attr |= FILE_ATTRIBUTE_READONLY;
    if( uiAttr & HB_FA_SYSTEM )    raw_attr |= FILE_ATTRIBUTE_SYSTEM;
-
+   if( uiAttr & HB_FA_NORMAL )    raw_attr |= FILE_ATTRIBUTE_NORMAL;
 #elif defined(HB_OS_UNIX)
 
    raw_attr = 0;
diff --git a/harbour/source/lang/msgpt.c b/harbour/source/lang/msgpt.c
index cd2bafdea4..9a8ea95edb 100644
--- a/harbour/source/lang/msgpt.c
+++ b/harbour/source/lang/msgpt.c
@@ -201,8 +201,8 @@ static HB_LANG s_lang =
       "Symbol item inv lido passado como memvar  %s",
       "Memory buffer overflow",
       "hb_xgrab requisitou para alocar zero bytes",
-      "hb_xrealloc requisitor para redimensiorar para zero byte",
-      "hb_xalloc requested to allocate zero bytes"
+      "hb_xrealloc requisitou para redimensiorar para zero byte",
+      "hb_xalloc requisitou para alocar zero bytes"
 
       /* Texts */