diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bf20e3abcd..caef6d7dad 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-11 17:19 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/xhb/trpccli.prg
+    ! fixed typo in function name.
+      Harbour has hb_inetPeriodCallback() not hb_inetSetPeriodCallback()
+
+  * harbour/contrib/xhb/xcstr.prg
+    ! disabled calling ValToPrgExp() used to serialize codeblocks
+    ! use __objGetValueList() instead of __objGetValueDiff() which does
+      not exist in Harbour
+
+  * harbour/contrib/xhb/trpc.prg
+    ! fixed xHarbour only function names: JoinThread() -> hb_threadJoin()
+      and StopThread() -> hb_threadQuitRequest()
+
 2009-08-11 17:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * Makefile
     % Using := instead of =
diff --git a/harbour/contrib/xhb/trpc.prg b/harbour/contrib/xhb/trpc.prg
index c5c9ed8dbc..441585fecd 100644
--- a/harbour/contrib/xhb/trpc.prg
+++ b/harbour/contrib/xhb/trpc.prg
@@ -444,7 +444,7 @@ METHOD Destroy() CLASS tRPCServeCon
    IF ::thFunction != NIL
       ::lCanceled := .T.
       HB_MutexUnlock( ::mtxBusy )
-      JoinThread( ::thFunction )
+      hb_threadJoin( ::thFunction )
       HB_MutexLock( ::mtxBusy )
    ENDIF
 
@@ -474,7 +474,7 @@ METHOD Stop() CLASS tRPCServeCon
       hb_threadQuitRequest( ::thSelf )
       lRet := .T.
       HB_MutexUnlock( ::mtxBusy )
-      JoinThread( ::thSelf )
+      hb_threadJoin( ::thSelf )
       ::thSelf := NIL
    ELSE
       HB_MutexUnlock( ::mtxBusy )
@@ -1362,18 +1362,18 @@ METHOD Stop() CLASS tRPCService
 
    hb_inetClose( ::skServer )
    // closing the socket will make their infinite loops to terminate.
-   StopThread( ::thAccept)
-   JoinThread( ::thAccept )
+   hb_threadQuitRequest( ::thAccept )
+   hb_threadJoin( ::thAccept )
    IF hb_threadId( ::thUDP ) != 0
       hb_inetClose( ::skUdp )
-      StopThread( ::thUdp)
-      JoinThread( ::thUdp )
+      hb_threadQuitRequest( ::thUdp )
+      hb_threadJoin( ::thUdp )
    ENDIF
 
    FOR EACH oElem IN ::aServing
       IF hb_threadId( oElem:thSelf ) != 0
          hb_threadQuitRequest( oElem:thSelf )
-         JoinThread( oElem:thSelf )
+         hb_threadJoin( oElem:thSelf )
       ENDIF
    NEXT
    ASize( ::aServing, 0 )
diff --git a/harbour/contrib/xhb/trpccli.prg b/harbour/contrib/xhb/trpccli.prg
index aebab40ebd..4a29b7d81e 100644
--- a/harbour/contrib/xhb/trpccli.prg
+++ b/harbour/contrib/xhb/trpccli.prg
@@ -665,8 +665,8 @@ METHOD SetPeriodCallback( ... ) CLASS tRPCClient
 
    IF ::skTCP != NIL
       hb_inetTimeout( ::skTCP, ::nTimeout )
-      hb_InetTimeLimit( ::skTCP, ::nTimeLimit )
-      hb_inetSetPeriodCallback( ::skTCP, caCalling )
+      hb_inetTimeLimit( ::skTCP, ::nTimeLimit )
+      hb_inetPeriodCallback( ::skTCP, caCalling )
    ENDIF
 
    HB_MutexUnlock( ::mtxBusy )
diff --git a/harbour/contrib/xhb/xcstr.prg b/harbour/contrib/xhb/xcstr.prg
index 295f5bcef2..09755d845d 100644
--- a/harbour/contrib/xhb/xcstr.prg
+++ b/harbour/contrib/xhb/xcstr.prg
@@ -201,8 +201,11 @@ FUNCTION ValToPrg( xVal, cName, nPad, aObjs )
             RETURN cRet
          ENDIF
 
+/* There is no support for codeblock serialization */
+#if 0
       CASE 'B'
          RETURN ValToPrgExp( xVal )
+#endif
 
       CASE 'P'
          RETURN "0x" + hb_NumToHex( xVal )
@@ -229,7 +232,7 @@ FUNCTION ValToPrg( xVal, cName, nPad, aObjs )
          nPad += 3
          cPad := Space( nPad )
 
-         FOR EACH aVar IN __objGetValueDiff( xVal )
+         FOR EACH aVar IN __objGetValueList( xVal )
             cRet += cPad + cName + ":" + aVar[1] + " := " + ValToPrg( aVar[2], cName + ":" + aVar[1], nPad, aObjs ) + CRLF
          NEXT