diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 267d035873..8b03f2bfd6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2003-05-07 14:45 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
+  * source/rdd/dbfntx/dbfntx1.c
+    ! OrdkeyCount() and OrdKeyNo() now returns physical records number and
+      position if there is no index opened or current order is 0
+  * source/rtl/set.c
+    ! two warnings fixed.
+
 2003-05-06 15:35 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   * source/rtl/is.c
     ! Bug fixed: ISUPPER, ISLOWER and ISALPHA with chr(0) argument
diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c
index 596a201be3..a51d7e43be 100644
--- a/harbour/source/rdd/dbfntx/dbfntx1.c
+++ b/harbour/source/rdd/dbfntx/dbfntx1.c
@@ -3808,9 +3808,18 @@ static ERRCODE ntxOrderInfo( NTXAREAP pArea, USHORT uiIndex, LPDBORDERINFO pInfo
       switch( uiIndex )
       {
          case DBOI_KEYCOUNT:
-         case DBOI_POSITION:
-            hb_itemPutND( pInfo->itmResult,0 );
+         {
+            ULONG ulRecCount = 0;
+            SELF_RECCOUNT( ( AREAP ) pArea, &ulRecCount );
+            hb_itemPutND( pInfo->itmResult,ulRecCount );
             break;
+         }
+         case DBOI_POSITION:
+         {
+            hb_itemPutND( pInfo->itmResult,0 );
+            SELF_RECNO( ( AREAP ) pArea, pInfo->itmResult );
+            break;
+         }
          case DBOI_ISCOND:
          case DBOI_ISDESC:
          case DBOI_UNIQUE:
diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c
index 9a3b310800..7cc3fb32bc 100644
--- a/harbour/source/rtl/set.c
+++ b/harbour/source/rtl/set.c
@@ -158,8 +158,7 @@ static int set_number( PHB_ITEM pItem, int iOldValue )
 
 static char * set_string( PHB_ITEM pItem, char * szOldString )
 {
-   char * szString = NULL;
-   ULONG ulLen = 0;
+   char * szString;
 
    HB_TRACE(HB_TR_DEBUG, ("set_string(%p, %s)", pItem, szOldString));