diff --git a/ChangeLog.txt b/ChangeLog.txt
index 376c19eb77..85a91337c1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,4 @@
-/*
+/*
  * $Id$
  */
 
@@ -10,6 +10,21 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-03 13:53 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * bin/check.hb
+    ! fixed BOM detection and fixup
+
+  * contrib/gtwvg/pushbut.prg
+    % use HB_ISSTRING() instead of ValType() call
+
+  * ChangeLog.txt
+    ! deleted BOM for the 4th time after:
+        2013-04-03 00:42 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+
+2013-04-03 13:52 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/gtwvg/pushbut.prg
+  * ChangeLog.txt
+
 2013-04-03 13:12 UTC+0200 Viktor Szakats (harbour syenar.net)
   * config/lang.hb
     + implemented translation corrections for right-to-left
diff --git a/bin/check.hb b/bin/check.hb
index 6184a8feed..e7cada1dfb 100644
--- a/bin/check.hb
+++ b/bin/check.hb
@@ -173,10 +173,10 @@ STATIC FUNCTION CheckFile( cName, /* @ */ aErr, lApplyFixes )
             AAdd( aErr, "content: has tab" )
          ENDIF
 
-         IF hb_BLeft( cFile, Len( UTF8_BOM() ) ) == UTF8_BOM()
+         IF hb_BLeft( cFile, hb_BLen( UTF8_BOM() ) ) == UTF8_BOM()
             AAdd( aErr, "content: has BOM" )
             IF lApplyFixes
-               cFile := hb_BSubStr( cFile, Len( UTF8_BOM() ) + 1 )
+               cFile := hb_BSubStr( cFile, hb_BLen( UTF8_BOM() ) + 1 )
             ENDIF
          ENDIF
 
diff --git a/contrib/gtwvg/pushbut.prg b/contrib/gtwvg/pushbut.prg
index 68ac00332b..d9b52de0df 100644
--- a/contrib/gtwvg/pushbut.prg
+++ b/contrib/gtwvg/pushbut.prg
@@ -240,7 +240,7 @@ METHOD WvgPushButton:setCaption( xCaption, cDll )
             Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_ICON, Wvg_LoadImage( xCaption[ 3 ], nLoadFromDiskFile, IMAGE_ICON ) )
             EXIT
          CASE WVG_IMAGE_ICONRESOURCE
-            IF ValType( xCaption[ 3 ] ) == "C"
+            IF HB_ISSTRING( xCaption[ 3 ] )
                Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_ICON, Wvg_LoadImage( xCaption[ 3 ], nLoadFromResByIdName, IMAGE_ICON ) )
             ELSE
                Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_ICON, Wvg_LoadImage( xCaption[ 3 ], nLoadFromResByIdNumber, IMAGE_ICON ) )
@@ -250,7 +250,7 @@ METHOD WvgPushButton:setCaption( xCaption, cDll )
             Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_BITMAP, Wvg_LoadImage( xCaption[ 3 ], nLoadFromDiskFile, IMAGE_BITMAP ) )
             EXIT
          CASE WVG_IMAGE_BITMAPRESOURCE
-            IF ValType( xCaption[ 3 ] ) == "C"
+            IF HB_ISSTRING( xCaption[ 3 ] )
                Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_ICON, Wvg_LoadImage( xCaption[ 3 ], nLoadFromResByIdName, IMAGE_BITMAP ) )
             ELSE
                Wvg_SendMessage( ::hWnd, BM_SETIMAGE, IMAGE_ICON, Wvg_LoadImage( xCaption[ 3 ], nLoadFromResByIdNumber, IMAGE_BITMAP ) )