diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 828116d424..101db5f095 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-17 15:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbrun/hbrun.prg
+    + Added GTWVT on win builds.
+
+  * src/rtl/gtcrs/gtcrs.c
+    ! Typo in comment.
+
+  * src/rtl/errapi.c
+    ! Deleted old TOFIX most pbly not relevant anymore.
+
+  * tests/testid.prg
+    ! Deleted old TOFIX and formatting.
+
 2011-02-17 13:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/achoice.prg
     + Added TOFIX.
diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg
index 7878a5ec9d..48752105c1 100644
--- a/harbour/contrib/hbrun/hbrun.prg
+++ b/harbour/contrib/hbrun/hbrun.prg
@@ -71,6 +71,9 @@ REQUEST __HB_EXTERN__
 REQUEST HB_GT_CGI
 REQUEST HB_GT_PCA
 REQUEST HB_GT_STD
+#if defined( __PLATFORM__WINDOWS )
+REQUEST HB_GT_WVT
+#endif
 
 #define HB_HISTORY_LEN 500
 #define HB_LINE_LEN    256
diff --git a/harbour/src/rtl/errapi.c b/harbour/src/rtl/errapi.c
index ca9c437bff..43d04cef57 100644
--- a/harbour/src/rtl/errapi.c
+++ b/harbour/src/rtl/errapi.c
@@ -493,8 +493,6 @@ HB_ERROR_INFO_PTR hb_errorHandler( HB_ERROR_INFO_PTR pNewHandler )
    return pOld;
 }
 
-/* TOFIX: Make it Clipper compatible. [vszakats] */
-
 HB_FUNC( DOSERROR )
 {
    PHB_ERRDATA pErrData = ( PHB_ERRDATA ) hb_stackGetTSD( &s_errData );
diff --git a/harbour/src/rtl/gtcrs/gtcrs.c b/harbour/src/rtl/gtcrs/gtcrs.c
index c505dec585..e82eff143b 100644
--- a/harbour/src/rtl/gtcrs/gtcrs.c
+++ b/harbour/src/rtl/gtcrs/gtcrs.c
@@ -1326,7 +1326,7 @@ static void disp_cursor( InOutBase * ioBase )
             cv = ioBase->cvvis;
             break;
          case SC_SPECIAL2:
-            /* TODO: find a proper sequqnce to set a cursor
+            /* TODO: find a proper sequence to set a cursor
                to SC_SPECIAL2 under Linux console?
                There is no such mode in current stable kernels (2.4.20)
              */
diff --git a/harbour/tests/testid.prg b/harbour/tests/testid.prg
index 3991dfad38..8e16a59bb3 100644
--- a/harbour/tests/testid.prg
+++ b/harbour/tests/testid.prg
@@ -1,18 +1,16 @@
-//NOTEST
-//
-// $Id$
-//
+/*
+ * $Id$
+ */
 
-// Warning: This sample must be tested using /dTEST compiler flag
-
-//TODO: Check why there is core dump om Linux if this file is compiled
-// without /dTEST
+#ifndef TEST
+#warning Warning: This sample must be tested using /dTEST compiler flag
+#endif
 
 #define FIRST
 #define SECOND
 #define THIRD
 
-function Main()
+FUNCTION Main()
 
    QOut( "testing Harbour /d compiler flag" )
 
@@ -20,7 +18,7 @@ function Main()
       QOut( "Fine, you have just tested the /d compiler flag" )
    #else
       QOut( "Please use /dTEST compiler flag" )
-      QOut( "Or run 'SET HB_USER_PRGFLAGS=/dTEST' if you are using the GNU Make System" )
+      QOut( "Or run 'set HB_USER_PRGFLAGS=/dTEST' if you are using the GNU Make System" )
    #endif
 
    #ifdef FIRST
@@ -43,4 +41,4 @@ function Main()
       QOut( "FIRST is not defined" )
    #endif
 
-return nil
+   RETURN NIL