diff --git a/ChangeLog.txt b/ChangeLog.txt
index 27b8ea88fc..f7fb8dcf0d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,4 @@
-/*
+/*
  * $Id$
  */
 
@@ -10,6 +10,26 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-12-06 15:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib\gtwvg\gtwvg.h
+    ! Increased: WVT_CHAR_QUEUE_SIZE         128 => 256
+        Required in cases where paste operation in a bigger character 
+        field is needed. Even this is hypothetical, but still works 
+        for most use cases.
+        
+  * contrib\gtwvg\gtwvgd.c
+    % Changed: behaviour of hb_gt_wvt_PutChar() to let SUPER GT layer 
+        to take the next action if application is not compiled for
+        GUI controls on CUI window. This is controlled by pWVT->bGui
+        member of GTWVG structure. This makes GTWVG at par with GTWVT 
+        if GUI controls are not sought as long as screen refreshes 
+        are concerned.
+        
+        Przemek, can you correct me if I am wrong?
+     
+  * contrib\gtwvg\wvtwin.ch
+    % Guarded: #deine RGB under #ifndef construct.
+
 2013-12-06 10:52 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * include/hbbfish.h
   * src/rtl/hbbffnc.c
@@ -28,11 +48,11 @@
 
 2013-11-28 03:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbmxml/3rd/minixml/mxml_fil.c
-    ! fixed mxmlLoadString() with top node - patch by Franček Prijatelj
+    ! fixed mxmlLoadString() with top node - patch by Francek Prijatelj
 
   * contrib/hbmxml/core.c
     ! fixed mxml node reference counter in mxmlAdd() - it fixes 2-dn
-      problem reported by Franček Prijatelj
+      problem reported by Francek Prijatelj
 
 2013-11-27 20:32 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/rtl/gtxwc/gtxwc.c
diff --git a/contrib/gtwvg/gtwvg.h b/contrib/gtwvg/gtwvg.h
index e58c7c655f..fbc35f1256 100644
--- a/contrib/gtwvg/gtwvg.h
+++ b/contrib/gtwvg/gtwvg.h
@@ -96,7 +96,7 @@ HB_EXTERN_BEGIN
 
 /*-*/
 
-#define WVT_CHAR_QUEUE_SIZE         128
+#define WVT_CHAR_QUEUE_SIZE         256
 #define WVT_MAX_TITLE_SIZE          128
 #define WVT_MAX_ROWS                256
 #define WVT_MAX_COLS               1024
diff --git a/contrib/gtwvg/gtwvgd.c b/contrib/gtwvg/gtwvgd.c
index b48340d857..35d4044b29 100644
--- a/contrib/gtwvg/gtwvgd.c
+++ b/contrib/gtwvg/gtwvgd.c
@@ -2842,9 +2842,16 @@ static HB_BOOL hb_gt_wvt_SetMode( PHB_GT pGT, int iRow, int iCol )
 static HB_BOOL hb_gt_wvt_PutChar( PHB_GT pGT, int iRow, int iCol,
                                   int iColor, HB_BYTE bAttr, HB_USHORT usChar )
 {
+   PHB_GTWVT pWVT;
+
    if( HB_GTSUPER_PUTCHAR( pGT, iRow, iCol, iColor, bAttr, usChar ) )
    {
-      HB_GTSELF_TOUCHCELL( pGT, iRow, iCol );
+      pWVT = HB_GTWVT_GET( pGT );
+      if( pWVT->bGui )
+         HB_GTSELF_TOUCHCELL( pGT, iRow, iCol );
+      else
+         HB_GTSUPER_TOUCHCELL( pGT, iRow, iCol );
+
       return HB_TRUE;
    }
    return HB_FALSE;
diff --git a/contrib/gtwvg/wvtwin.ch b/contrib/gtwvg/wvtwin.ch
index 87d3ffdfe8..e3d8c6b041 100644
--- a/contrib/gtwvg/wvtwin.ch
+++ b/contrib/gtwvg/wvtwin.ch
@@ -190,9 +190,9 @@
 #define WVT_MENU_MENUOBJ                          4
 
 /*-*/
-
+#ifndef RGB
 #define RGB( nR, nG, nB )   ( nR + ( nG * 256 ) + ( nB * 256 * 256 ) )
-
+#endif
 //
 //                          Windows Specific
 //