diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5b54431bc4..83f6613dbd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-21 11:19 UTC-0800 Brian Hays <bhays@abacuslaw.com>
+
+   * source/rtl/transfrm.c
+      * Fixed @Z handling
+
+   * source/rdd/dbcmd.c
+      * Fixed Select("") to return 0
+         Note that select() returns current workarea even if unused
+
 2001-06-21 22:20 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * contrib/dot/pp.prg
      * Added support fort '|' as a continuation token (as in Clipper).
diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c
index c28bf68bad..8b1198b713 100644
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -379,7 +379,7 @@ static USHORT hb_rddSelect( char * szAlias )
 }
 
 /*
- * Return thne next free WorkArea for later use.
+ * Return the next free WorkArea for later use.
  */
 static void hb_rddSelectFirstAvailable( void )
 {
@@ -2714,7 +2714,9 @@ HB_FUNC( SELECT )
    szAlias = hb_parc( 1 );
    ulLen = strlen( szAlias );
 
-   if( ulLen == 1 && toupper( szAlias[ 0 ] ) >= 'A' && toupper( szAlias[ 0 ] ) <= 'K' )
+   if( ulLen == 0 && ISCHAR( 1 ))
+      hb_retni( 0 );
+   else if( ulLen == 1 && toupper( szAlias[ 0 ] ) >= 'A' && toupper( szAlias[ 0 ] ) <= 'K' )
       hb_retni( toupper( szAlias[ 0 ] ) - 'A' + 1 );
    else if( ulLen > 0 )
       hb_retni( hb_rddSelect( szAlias ) );
diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c
index c0ad52dc93..1bb95f6e3d 100644
--- a/harbour/source/rtl/transfrm.c
+++ b/harbour/source/rtl/transfrm.c
@@ -366,7 +366,7 @@ HB_FUNC( TRANSFORM )
 
          /* Don't empty the result if the number is not zero */
          if( dPush != 0 && ( uiPicFlags & PF_EMPTY ) )
-            uiPicFlags &= ~uiPicFlags;
+               uiPicFlags &= ~PF_EMPTY;
 
          if( iWidth == 0 )                             /* Width calculated ??      */
          {