diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8b55959060..02ea6e7ae5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,15 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-16 20:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbxbp/tests/demoxbp.prg
+  * contrib/hbxbp/xbpwindow.prg
+    ! Applied patch from Istvan Bisz, fixing some typos in recent commits. 
+      Thank you!
+
+  * ChangeLog
+    * Few TODOs marked DONE.
+
 2009-11-16 19:52 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/nortl/nortl.c
     ! fixed left by mistake ULONG ulIntCode in non HVM hb_errInternal()
@@ -158,12 +167,12 @@
     * Changed USHORT type for error codes to HB_ERRCODE.
     + More or less changed int type of Extend/Item API call to 
       long type to prepare for HB_ERRCODE change to ULONG.
-    ; TODO: Rename variables to reflect new type.
-    ; TODO: Change internal error code from ULONG to HB_ERRCODE.
+    ; TODO: Rename variables to reflect new type. [DONE]
+    ; TODO: Change internal error code from ULONG to HB_ERRCODE. [DONE]
     ; TODO: Inspect rest of Harbour like above. I've only dealt with 
             rtl, vm.
     ; TODO: hbnetio protocol needs to be modified to pass errcode 
-            as 32 bit value.
+            as 32 bit value. [DONE]
     ; NOTE: There is still disagreement in code in few places 
             in error type and 'int' is used internally, f.e. 
             sockets, some internal OS code conversion funtions.
diff --git a/harbour/contrib/hbxbp/tests/demoxbp.prg b/harbour/contrib/hbxbp/tests/demoxbp.prg
index 5a16b21126..67e89c0764 100644
--- a/harbour/contrib/hbxbp/tests/demoxbp.prg
+++ b/harbour/contrib/hbxbp/tests/demoxbp.prg
@@ -111,7 +111,7 @@ FUNCTION _BuildADialog()
 PROCEDURE DispMem( cMessage )
 
    HB_SYMBOL_UNUSED( cMessage )
-   HBXBP_DEBUG( ThreadID(), padc( cMessage, 40 ), memory( 1001 ), hb_getMemUsed() )
+   HBXBP_DEBUG( ThreadID(), padc( cMessage, 40 ), memory( 1001 ), hbqt_getMemUsed() )
 
    RETURN
 
diff --git a/harbour/contrib/hbxbp/xbpwindow.prg b/harbour/contrib/hbxbp/xbpwindow.prg
index f71696ab30..86949cda38 100644
--- a/harbour/contrib/hbxbp/xbpwindow.prg
+++ b/harbour/contrib/hbxbp/xbpwindow.prg
@@ -721,7 +721,7 @@ METHOD XbpWindow:destroy()
    LOCAL cXbp := __ObjGetClsName( self )
 
 HBXBP_DEBUG( ".   " )
-HBXBP_DEBUG( ThreadID(),"Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hb_getMemUsed() )
+HBXBP_DEBUG( ThreadID(),"Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() )
 
    IF cXbp == "XBPDIALOG"
       SetEventLoop( NIL )
@@ -761,7 +761,7 @@ HBXBP_DEBUG( ThreadID(),"Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::
    ::oWidget:pPtr := 0
    ::oWidget := NIL
 
-HBXBP_DEBUG( ThreadID(),"          Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hb_getMemUsed() )
+HBXBP_DEBUG( ThreadID(),"          Destroy: "+pad(__ObjGetClsName( self ),12)+ IF(empty(::cargo),'',str(::cargo) ), memory( 1001 ), hbqt_getMemUsed() )
 
    RETURN NIL