diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4375b72cba..21d489ecf8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-10-30 01:02 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/compiler/hbopt.c
+    * minor: 1 => HB_TRUE
+
+  * src/rtl/gtwvt/gtwvt.c
+    ! clear margins leaving maximized mode
+
 2013-10-28 17:18 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/rdd/wafunc.c
     * minor cleanup
diff --git a/src/compiler/hbopt.c b/src/compiler/hbopt.c
index da01bf5ea2..04095b1edb 100644
--- a/src/compiler/hbopt.c
+++ b/src/compiler/hbopt.c
@@ -1422,7 +1422,7 @@ static void hb_compPCodeEnumAssignedUnused( HB_COMP_DECL, PHB_HFUNC pFunc, PHB_O
                bCodeNext2 == HB_P_DECEQ ||
                bCodeNext2 == HB_P_INCEQ ) )
          {
-            fCheck = 1;
+            fCheck = HB_TRUE;
          }
       }
 
diff --git a/src/rtl/gtwvt/gtwvt.c b/src/rtl/gtwvt/gtwvt.c
index 31a318eb7c..000a35f53f 100644
--- a/src/rtl/gtwvt/gtwvt.c
+++ b/src/rtl/gtwvt/gtwvt.c
@@ -1816,14 +1816,15 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
                   pWVT->MarginLeft = ( wi.right - wi.left - width  ) / 2;
                   pWVT->MarginTop  = ( wi.bottom - wi.top - height ) / 2;
                }
-               else if( wi.right - wi.left != width || wi.bottom - wi.top != height )
-                        /* above condition is necessary to avoid infinite
-                         * recursive in WInCE builds
-                         */
+               else
                {
                   pWVT->MarginLeft = 0;
                   pWVT->MarginTop  = 0;
-                  SetWindowPos( pWVT->hWnd, NULL, left, top, width, height, SWP_NOZORDER );
+                  if( wi.right - wi.left != width || wi.bottom - wi.top != height )
+                      /* above condition is necessary to avoid infinite
+                       * recursive in WInCE builds
+                       */
+                     SetWindowPos( pWVT->hWnd, NULL, left, top, width, height, SWP_NOZORDER );
                }
 
                if( pWVT->CaretExist && ! pWVT->CaretHidden )