diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 82657d9181..f65c81ae54 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-15 00:44 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * contrib/hbwin/win_regc.c
+    * Minor cleanup to make code more robust.
+
+  * contrib/hbqt/qtgui/QTableView.cpp
+    * Some minor changes after regenerating it with current generator tool.
+
 2009-12-14 10:01 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/hbqt.h
   * contrib/hbqt/hbqt_hbqtableview.cpp
diff --git a/harbour/contrib/hbqt/qtgui/QTableView.cpp b/harbour/contrib/hbqt/qtgui/QTableView.cpp
index eabd78ce10..ddd97b5311 100644
--- a/harbour/contrib/hbqt/qtgui/QTableView.cpp
+++ b/harbour/contrib/hbqt/qtgui/QTableView.cpp
@@ -110,25 +110,16 @@ QT_G_FUNC( release_QTableView )
             break;
          }
          p->ph = NULL;
-         HB_TRACE( HB_TR_DEBUG, ( "release_QTableView                  Object deleted!" ) );
-         #if defined( __HB_DEBUG__ )
-            hbqt_debug( "  YES release_QTableView                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() );
-         #endif
+         HB_TRACE( HB_TR_DEBUG, ( "release_QTableView                  Object deleted! %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
       }
       else
       {
-         HB_TRACE( HB_TR_DEBUG, ( "release_QTableView                  Object Name Missing!" ) );
-         #if defined( __HB_DEBUG__ )
-            hbqt_debug( "  NO  release_QTableView" );
-         #endif
+         HB_TRACE( HB_TR_DEBUG, ( "NO release_QTableView                  Object Name Missing!" ) );
       }
    }
    else
    {
-      HB_TRACE( HB_TR_DEBUG, ( "release_QTableView                  Object Allready deleted!" ) );
-      #if defined( __HB_DEBUG__ )
-         hbqt_debug( "  DEL release_QTableView" );
-      #endif
+      HB_TRACE( HB_TR_DEBUG, ( "DEL release_QTableView                  Object Already deleted!" ) );
    }
 }
 
@@ -139,9 +130,7 @@ void * gcAllocate_QTableView( void * pObj )
    p->ph = pObj;
    p->func = release_QTableView;
    new( & p->pq ) QPointer< QTableView >( ( QTableView * ) pObj );
-   #if defined( __HB_DEBUG__ )
-      hbqt_debug( "          new_QTableView                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() );
-   #endif
+   HB_TRACE( HB_TR_DEBUG, ( "          new_QTableView                  %i B %i KB", ( int ) hb_xquery( 1001 ), hbqt_getmemused() ) );
    return( p );
 }
 
diff --git a/harbour/contrib/hbwin/win_regc.c b/harbour/contrib/hbwin/win_regc.c
index f9c228937a..e3d8020243 100644
--- a/harbour/contrib/hbwin/win_regc.c
+++ b/harbour/contrib/hbwin/win_regc.c
@@ -185,12 +185,13 @@ HB_FUNC( WIN_REGSETVALUEEX )
 {
    void * hKey;
    DWORD dwType = ( DWORD ) hb_parnl( 4 );
+   LPCTSTR lpKey = HB_PARSTRDEF( 2, &hKey, NULL );
 
    if( dwType == REG_DWORD )
    {
       DWORD nSpace = ( DWORD ) hb_parnl( 5 );
       hb_retl( RegSetValueEx( ( HKEY ) hb_parptr( 1 ),
-                              HB_PARSTRDEF( 2, &hKey, NULL ),
+                              lpKey,
                               0,
                               dwType,
                               ( const BYTE * ) &nSpace,
@@ -211,7 +212,7 @@ HB_FUNC( WIN_REGSETVALUEEX )
       #endif
 
       hb_retl( RegSetValueEx( ( HKEY ) hb_parptr( 1 ),
-                              HB_PARSTRDEF( 2, &hKey, NULL ),
+                              lpKey,
                               0,
                               dwType,
                               ( const BYTE * ) lpValue,
@@ -221,7 +222,7 @@ HB_FUNC( WIN_REGSETVALUEEX )
    }
    else /* No translation for binary data */
       hb_retl( RegSetValueEx( ( HKEY ) hb_parptr( 1 ),
-                              HB_PARSTRDEF( 2, &hKey, NULL ),
+                              lpKey,
                               0,
                               dwType,
                               ( const BYTE * ) hb_parc( 5 ) /* cValue */,