diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 727a7fcc04..06c9319d33 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-21 08:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * source/vm/extend.c
+    * Minor formatting.
+
+  * source/rtl/mlcfunc.c
+    ! Fixed warning in HB_C52_STRICT mode.
+
+  * contrib/hbxbp/xbp.ch
+    ! Fixed HB_OUTDEBUG() macro to work also in codeblocks when
+      not in debug mode, and also to better handle the case when
+      parameter is a variable.
+
+  * ChangeLog
+    + Added incompat NOTE to hb_par*/hb_stor*() change.
+
 2009-06-21 07:05 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/mlcfunc.c
     ! fixed missing ulLen declaration in if() branch
@@ -39,7 +54,7 @@
     + Demonstrated XbpComboBox() implementation.
 
     NOTE:  I am not sure about the way I am simulating Xbase++
-           class behavior. Can someone review xbpcombobox.prg 
+           class behavior. Can someone review xbpcombobox.prg
            and see if this can be improved. I am not well equipped
            as far as classes can be exploited to full extent.
 
@@ -86,6 +101,10 @@
       by hb_parv*() and hb_storv*()
     TODO: update examples/hbwhat/*.c files
 
+    ; NOTE: INCOMPATIBLE. You'll need to modify hb_par*()/hb_stor*()
+            instances where they are used with extra parameter to
+            hb_parv*()/hb_storv*(). [vszakats]
+
   * harbour/examples/uhttpd2/socket.c
   * harbour/examples/httpsrv/socket.c
     * changed hb_parni() to hb_parnidef()
@@ -97,7 +116,6 @@
   * harbour/source/macro/macrolex.c
     * replaced HB_LEX_IS*() macros by by HB_IS*() ones
 
-
 2009-06-20 12:01 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/hbxbp/xbpdataref.prg
   + harbour/contrib/hbxbp/xbpspinbutton.prg
diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch
index a8a4709464..464e5306a6 100644
--- a/harbour/contrib/hbxbp/xbp.ch
+++ b/harbour/contrib/hbxbp/xbp.ch
@@ -7,7 +7,7 @@
 #if defined( __HB_OUTDEBUG__ ) .AND. defined( __PLATFORM__WINDOWS )
    #xtranslate HB_OUTDEBUG( [<x>] ) => WAPI_OUTPUTDEBUGSTRING( <x> )
 #else
-   #xtranslate HB_OUTDEBUG( [<x>] ) =>
+   #xtranslate HB_OUTDEBUG( [<x>] ) => HB_SYMBOL_UNUSED( <x> )
 #endif
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/source/rtl/mlcfunc.c b/harbour/source/rtl/mlcfunc.c
index 671f219b94..9cb4c9625e 100644
--- a/harbour/source/rtl/mlcfunc.c
+++ b/harbour/source/rtl/mlcfunc.c
@@ -155,7 +155,6 @@ static PHB_EOL_INFO hb_mlGetEOLs( int iParam, int * piEOLs )
 {
    PHB_EOL_INFO pEOLs = NULL;
    int iEOLs = 0;
-   ULONG ulLen = hb_parclen( iParam );
 
 /* NOTE: This is a parameter extension (HB_EXTENSION) which breaks
          our effort to keep strict parameter compatibility with
@@ -164,6 +163,7 @@ static PHB_EOL_INFO hb_mlGetEOLs( int iParam, int * piEOLs )
          Clipper will ignore these parameters and use CRLF EOL hard
          coded. [vszakats] */
 #ifndef HB_C52_STRICT /* HB_EXTENSION */
+   ULONG ulLen = hb_parclen( iParam );
    if( ulLen )
    {
       pEOLs = ( PHB_EOL_INFO ) hb_xgrab( sizeof( HB_EOL_INFO ) );
diff --git a/harbour/source/vm/extend.c b/harbour/source/vm/extend.c
index 921c0390c5..ae05e78ee6 100644
--- a/harbour/source/vm/extend.c
+++ b/harbour/source/vm/extend.c
@@ -823,14 +823,10 @@ LONG  hb_parvdl( int iParam, ... )
       PHB_ITEM pItem = ( iParam == -1 ) ? hb_stackReturnItem() : hb_stackItemFromBase( iParam );
 
       if( HB_IS_BYREF( pItem ) )
-      {
          pItem = hb_itemUnRef( pItem );
-      }
 
       if( HB_IS_DATETIME( pItem ) )
-      {
          return pItem->item.asDateTime.julian;
-      }
       else if( HB_IS_ARRAY( pItem ) )
       {
          va_list va;
@@ -858,15 +854,11 @@ double hb_parvtd( int iParam, ... )
       PHB_ITEM pItem = ( iParam == -1 ) ? hb_stackReturnItem() : hb_stackItemFromBase( iParam );
 
       if( HB_IS_BYREF( pItem ) )
-      {
          pItem = hb_itemUnRef( pItem );
-      }
 
       if( HB_IS_DATETIME( pItem ) )
-      {
          return hb_timeStampPackDT( pItem->item.asDateTime.julian,
                                     pItem->item.asDateTime.time );
-      }
       else if( HB_IS_ARRAY( pItem ) )
       {
          va_list va;
@@ -894,9 +886,7 @@ BOOL hb_parvtdt( LONG * plJulian, LONG * plMilliSec , int iParam, ... )
       PHB_ITEM pItem = ( iParam == -1 ) ? hb_stackReturnItem() : hb_stackItemFromBase( iParam );
 
       if( HB_IS_BYREF( pItem ) )
-      {
          pItem = hb_itemUnRef( pItem );
-      }
 
       if( HB_IS_DATETIME( pItem ) )
       {