diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 159cf8bec5..b5ccd7c307 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-07 21:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/runner.c
+  * harbour/source/vm/codebloc.c
+  * harbour/source/vm/itemapi.c
+    * minor casting modification
+
+  * harbour/tests/speedtst.prg
+    * added workaround for timeout parameter not working in xHb Subscribe()
+      when 3-rd parameter is passed
+
 2008-10-07 19:33 UTC+0200 Maurilio Longo (maurilio.longo@libero.it)
   * harbour/source/rtl/seconds.c
     ! fixed little typo after latest commit.
diff --git a/harbour/source/vm/codebloc.c b/harbour/source/vm/codebloc.c
index dd04e3cd53..ed594664ca 100644
--- a/harbour/source/vm/codebloc.c
+++ b/harbour/source/vm/codebloc.c
@@ -63,7 +63,7 @@
    to freed by GC codeblock in .prg destructors and then (after
    catching RT EG_DESTRUCTOR error) try to execute them
  */
-static const BYTE s_pCode[] = { HB_P_PUSHNIL, HB_P_ENDBLOCK };
+static const BYTE s_pCode[ 2 ] = { HB_P_PUSHNIL, HB_P_ENDBLOCK };
 
 /* Release all allocated memory when called from the garbage collector
  */
diff --git a/harbour/source/vm/itemapi.c b/harbour/source/vm/itemapi.c
index 6a16f3f8cc..91603fc793 100644
--- a/harbour/source/vm/itemapi.c
+++ b/harbour/source/vm/itemapi.c
@@ -1933,8 +1933,8 @@ HB_EXPORT PHB_ITEM hb_itemClone( PHB_ITEM pItem )
 /* Check whether two strings are equal (0), smaller (-1), or greater (1) */
 HB_EXPORT int hb_itemStrCmp( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact )
 {
-   char * szFirst;
-   char * szSecond;
+   const char * szFirst;
+   const char * szSecond;
    ULONG ulLenFirst;
    ULONG ulLenSecond;
    ULONG ulMinLen;
@@ -2013,8 +2013,8 @@ HB_EXPORT int hb_itemStrCmp( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact
 /* Check whether two strings are equal (0), smaller (-1), or greater (1), ignore case */
 HB_EXPORT int hb_itemStrICmp( PHB_ITEM pFirst, PHB_ITEM pSecond, BOOL bForceExact )
 {
-   char * szFirst;
-   char * szSecond;
+   const char * szFirst;
+   const char * szSecond;
    ULONG ulLenFirst;
    ULONG ulLenSecond;
    ULONG ulMinLen;
diff --git a/harbour/source/vm/runner.c b/harbour/source/vm/runner.c
index 562677db81..007d390f06 100644
--- a/harbour/source/vm/runner.c
+++ b/harbour/source/vm/runner.c
@@ -89,7 +89,7 @@ typedef struct
    PHB_SYMBOLS    pModuleSymbols;
 } HRB_BODY, * PHRB_BODY;
 
-static const BYTE szHead[] = { 192,'H','R','B' };
+static const BYTE szHead[ 4 ] = { 192,'H','R','B' };
 
 
 #define SYM_NOLINK   0              /* symbol does not have to be linked */
diff --git a/harbour/tests/speedtst.prg b/harbour/tests/speedtst.prg
index b711bdcab9..916f74035f 100644
--- a/harbour/tests/speedtst.prg
+++ b/harbour/tests/speedtst.prg
@@ -137,8 +137,11 @@ return
       local lSubscribed
       if valtype( nTimeOut ) == "N"
          nTimeOut := round( nTimeOut * 1000, 0 )
+         xSubscribed := Subscribe( mtx, nTimeOut, @lSubscribed )
+      else
+         xSubscribed := Subscribe( mtx )
+         lSubscribed := .t.
       endif
-      xSubscribed := Subscribe( mtx, nTimeOut, @lSubscribed )
    return lSubscribed
 
    /* in xHarbour there is race condition in JoinThread() which