diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8cb37a17ac..b53b9b5858 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,24 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-18 02:53 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * source/rtl/gtwvt/gtwvt.c
+    ! Fix to previous fix to maximize the window when the initial 
+      size would be too big to fit on screen (stupid omission).
+      Now the previously cited sizing problem is alright.
+
+  * source/vm/fm.c
+    + Replaced HB_NO_FM_STAT and HB_FM_STAT envvars 
+      with HB_FM_STAT=yes|no (maybe 0|1 or on|off woud be 
+      better or could be accepted as alternatives or 
+      replacement). This is to avoid ambiguity when both 
+      envvars were set or the app default is not known.
+    + Added HB_FM_STATISTICS_DYN_OFF to turn off mem tracking 
+      by default when stat module is linked in.
+
+  * source/common/hbverdsp.c
+    * Minor cosmetic.
+
 2008-11-18 01:36 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/make_gcc.sh
   * harbour/make_gcc.mak
diff --git a/harbour/source/common/hbverdsp.c b/harbour/source/common/hbverdsp.c
index 7a07211647..d8301845d8 100644
--- a/harbour/source/common/hbverdsp.c
+++ b/harbour/source/common/hbverdsp.c
@@ -155,13 +155,13 @@ void hb_verBuildInfo( void )
 
    hb_conOutErr( "Language options: ", 0 );
 #if defined( HB_COMPAT_C53 )
-   hb_conOutErr( "(C5.3) ", 0 );
+   hb_conOutErr( "(Clipper 5.3) ", 0 );
 #endif
 #if defined( HB_C52_UNDOC )
-   hb_conOutErr( "(C5.x undoc) ", 0 );
+   hb_conOutErr( "(Clipper 5.x undoc) ", 0 );
 #endif
 #if defined( HB_C52_STRICT )
-   hb_conOutErr( "(C5.x strict) ", 0 );
+   hb_conOutErr( "(Clipper 5.x strict) ", 0 );
 #endif
 #if defined( HB_COMPAT_XPP )
    hb_conOutErr( "(Xbase++) ", 0 );
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index a954d316b1..c4e963c9d5 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -765,13 +765,12 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT )
 
    if( wi.left < 0 || wi.top < 0 )
    {
+      pWVT->bMaximized = TRUE;
+
       if( pWVT->ResizeMode == HB_GTI_RESIZEMODE_FONT )
          hb_gt_wvt_FitSize( pWVT );
       else
-      {
          hb_gt_wvt_FitRows( pWVT );
-         hb_gt_wvt_AddCharToInputQueue( pWVT, HB_K_RESIZE );
-      }
 
       /* resize the window to get the specified number of rows and columns */
       GetWindowRect( pWVT->hWnd, &wi );
@@ -809,7 +808,7 @@ static void hb_gt_wvt_SetWindowTitle( HWND hWnd, const char * title )
 
 static BOOL hb_gt_wvt_GetWindowTitle( HWND hWnd, char ** title )
 {
-   TCHAR buffer[WVT_MAX_TITLE_SIZE];
+   TCHAR buffer[ WVT_MAX_TITLE_SIZE ];
    int iResult;
 
    iResult = GetWindowText( hWnd, buffer, WVT_MAX_TITLE_SIZE );
@@ -1636,9 +1635,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
                if( pWVT->ResizeMode == HB_GTI_RESIZEMODE_FONT )
                   hb_gt_wvt_FitSize( pWVT );
                else
-               {
                   hb_gt_wvt_FitRows( pWVT );
-               }
 
                /* Disable "maximize" button */
 #if (defined(_MSC_VER) && (_MSC_VER <= 1200 || defined(HB_WINCE)) || defined(__DMC__)) && !defined(HB_ARCH_64BIT)
diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c
index 99cb70c06b..8cd9f2f058 100644
--- a/harbour/source/vm/fm.c
+++ b/harbour/source/vm/fm.c
@@ -744,12 +744,19 @@ void hb_xinit( void ) /* Initialize fixed memory subsystem */
 #ifdef HB_FM_STATISTICS
    if( !s_fInited )
    {
-      if( hb_getenv_buffer( "HB_FM_STAT", NULL, 0 ) )
-         s_fStatistic = TRUE;
-      else if( hb_getenv_buffer( "HB_NO_FM_STAT", NULL, 0 ) )
-         s_fStatistic = FALSE;
+      char buffer[ 5 ];
+
+      if( hb_getenv_buffer( "HB_FM_STAT", buffer, sizeof( buffer ) ) )
+      {
+         if( hb_stricmp( "yes", buffer ) == 0 )
+            s_fStatistic = TRUE;
+         else if( hb_stricmp( "no", buffer ) == 0 )
+            s_fStatistic = FALSE;
+      }
+#ifndef HB_FM_STATISTICS_DYN_OFF
       else
          s_fStatistic = TRUE;  /* enabled by default */
+#endif
 
       s_fInited = TRUE;
    }