diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f1b7a5e5bf..1a5c0c46ee 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-15 15:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbexprb.c
+    ! s&r error bug in recent change.
+
+  * utils/hbmk2/hbmk2.prg
+    + Accepting name=, description=, verison= .hbc lines.
+      Just a step, no real purpose.
+
+  * contrib/hbodbc/odbc.c
+    * long -> HB_SIZE
+    * ULONG -> HB_SIZE
+
 2010-01-15 12:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbdefs.h
     + Marked BOOL, TRUE and FALSE as HB_LEGACY_LEVEL3.
diff --git a/harbour/contrib/hbodbc/odbc.c b/harbour/contrib/hbodbc/odbc.c
index 5e670b6d61..7a61728574 100644
--- a/harbour/contrib/hbodbc/odbc.c
+++ b/harbour/contrib/hbodbc/odbc.c
@@ -222,7 +222,7 @@ HB_FUNC( SQLGETDATA ) /* hStmt, nField, nType, nLen, @cBuffer --> nRetCode */
    lLen = ( SQLLEN ) hb_parnint( 4 );
    if( ! lLen )
       lLen = 64;
-   bBuffer    = hb_xgrab( ( ULONG ) lLen + 1 );
+   bBuffer    = hb_xgrab( ( HB_SIZE ) lLen + 1 );
    bOut       = NULL;
    lInitBuff  = lLen;
    lBuffLen   = 0;
@@ -239,7 +239,7 @@ HB_FUNC( SQLGETDATA ) /* hStmt, nField, nType, nLen, @cBuffer --> nRetCode */
 
       if( result == SQL_SUCCESS && iReallocs == 0 )
       {
-         hb_storclen( ( char * ) bBuffer, ( long ) ( lLen < 0 ? 0 : ( lLen < hb_parnl( 4 ) ? lLen : hb_parnl( 4 ) ) ), 5 );
+         hb_storclen( ( char * ) bBuffer, ( HB_SIZE ) ( lLen < 0 ? 0 : ( lLen < hb_parnl( 4 ) ? lLen : hb_parnl( 4 ) ) ), 5 );
          break;
       }
       else if( result == SQL_SUCCESS_WITH_INFO && iReallocs == 0 )
@@ -249,22 +249,22 @@ HB_FUNC( SQLGETDATA ) /* hStmt, nField, nType, nLen, @cBuffer --> nRetCode */
          {
             /* data right truncated! */
             lBuffLen = lLen;
-            bOut = ( char * ) hb_xgrab( ( ULONG ) lBuffLen + 1 );
+            bOut = ( char * ) hb_xgrab( ( HB_SIZE ) lBuffLen + 1 );
             hb_strncpy( ( char * ) bOut, ( char * ) bBuffer, lLen );
             lLen = lLen - lInitBuff + 2;
-            bBuffer = ( char * ) hb_xrealloc( bBuffer, ( ULONG ) lLen );
+            bBuffer = ( char * ) hb_xrealloc( bBuffer, ( HB_SIZE ) lLen );
             iReallocs++;
          }
          else
          {
-            hb_storclen( ( char * ) bBuffer, ( long ) ( lLen < 0 ? 0 : ( lLen < hb_parnl( 4 ) ? lLen : hb_parnl( 4 ) ) ), 5 );
+            hb_storclen( ( char * ) bBuffer, ( HB_SIZE ) ( lLen < 0 ? 0 : ( lLen < hb_parnl( 4 ) ? lLen : hb_parnl( 4 ) ) ), 5 );
             break;
          }
       }
       else if( ( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO ) && iReallocs > 0 )
       {
          hb_strncat( ( char * ) bOut, ( char * ) bBuffer, lBuffLen );
-         hb_storclen( ( char * ) bOut, ( long ) ( lLen + lInitBuff - 1 ), 5 );
+         hb_storclen( ( char * ) bOut, ( HB_SIZE ) ( lLen + lInitBuff - 1 ), 5 );
          result = SQL_SUCCESS;
          break;
       }
@@ -314,7 +314,7 @@ HB_FUNC( SQLDESCRIBECOL ) /* hStmt, nCol, @cName, nLen, @nBufferLen, @nDataType,
       if( HB_ISBYREF( 3 ) )
       {
          char * szStr = HB_TCHAR_CONVNFROM( buffer, wBufLen );
-         hb_storclen( szStr, ( long ) wBufLen, 3 );
+         hb_storclen( szStr, ( HB_SIZE ) wBufLen, 3 );
          HB_TCHAR_FREE( szStr );
       }
       hb_storni( ( int ) wBufLen, 5 );
@@ -355,7 +355,7 @@ HB_FUNC( SQLCOLATTRIBUTE ) /* hStmt, nCol, nField, @cName, nLen, @nBufferLen, @n
 
    if( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO )
    {
-      hb_storclen( ( char * ) bBuffer, ( long ) wBufLen, 4 );
+      hb_storclen( ( char * ) bBuffer, ( HB_SIZE ) wBufLen, 4 );
       hb_storni( ( int ) wBufLen, 6 );
       hb_stornint( wNumPtr, 7 );
    }
diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c
index cffdcfa5ec..dafc875619 100644
--- a/harbour/include/hbexprb.c
+++ b/harbour/include/hbexprb.c
@@ -976,13 +976,13 @@ static HB_EXPR_FUNC( hb_compExprUseIIF )
 #if defined( HB_MACRO_SUPPORT )
          if( HB_PCODE_DATA->lPCodePos == ulPosFalse + 3 )
          {
-            HB_PCODE_DATA->pCode[ ulPosFalse - 1 ] = HB_P_JUMPHB_TRUEFAR;
+            HB_PCODE_DATA->pCode[ ulPosFalse - 1 ] = HB_P_JUMPTRUEFAR;
             ulPosEnd = ulPosFalse;
          }
 #else
          if( HB_COMP_PARAM->functions.pLast->lPCodePos == ulPosFalse + 3 )
          {
-            HB_COMP_PARAM->functions.pLast->pCode[ ulPosFalse - 1 ] = HB_P_JUMPHB_TRUEFAR;
+            HB_COMP_PARAM->functions.pLast->pCode[ ulPosFalse - 1 ] = HB_P_JUMPTRUEFAR;
             ulPosEnd = ulPosFalse;
          }
 #endif
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 74f83fcc50..70b587fafd 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -6390,6 +6390,19 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
             ENDIF
          ENDIF
 
+      /* .hbc identification strings. Similar to pkgconfig ones. */
+      CASE Lower( Left( cLine, Len( "name="         ) ) ) == "name="         ; cLine := SubStr( cLine, Len( "name="         ) + 1 )
+
+         /* Silently ignore */
+
+      CASE Lower( Left( cLine, Len( "description="  ) ) ) == "description="  ; cLine := SubStr( cLine, Len( "description="  ) + 1 )
+
+         /* Silently ignore */
+
+      CASE Lower( Left( cLine, Len( "version="      ) ) ) == "version="      ; cLine := SubStr( cLine, Len( "version="      ) + 1 )
+
+         /* Silently ignore */
+
       ENDCASE
    NEXT