diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 33cef3c181..549d4d80c8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-22 13:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/compiler/complex.c
+    ! HB_ULONG -> HB_SIZE in one cast.
+
+  * src/pp/pplib.c
+    ! HB_ULONG -> HB_ERRCODE
+
+  * contrib/hbgt/asciisgt.c
+    ! HB_ULONG -> HB_MAXUINT
+
 2010-06-22 13:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/vm/fm.c
     ! Replaced 'long' with HB_ISIZ in FM stats code.
diff --git a/harbour/contrib/hbgt/asciisgt.c b/harbour/contrib/hbgt/asciisgt.c
index 6eb987b83f..bdb33a3182 100644
--- a/harbour/contrib/hbgt/asciisgt.c
+++ b/harbour/contrib/hbgt/asciisgt.c
@@ -22,7 +22,7 @@ HB_FUNC( GT_ASCIISUM )
    const char * str = hb_parcx( 1 );
    HB_ISIZ len = hb_parclen( 1 );
    HB_ISIZ i;
-   HB_ULONG ascSum = 0;
+   HB_MAXUINT ascSum = 0;
 
    for( i = 0; i <= len; i++, str++ )
       ascSum += *str;
diff --git a/harbour/src/compiler/complex.c b/harbour/src/compiler/complex.c
index 932de04ca1..da2805d368 100644
--- a/harbour/src/compiler/complex.c
+++ b/harbour/src/compiler/complex.c
@@ -278,7 +278,7 @@ static const char * hb_comp_tokenString( YYSTYPE *yylval_ptr, HB_COMP_DECL, PHB_
    yylval_ptr->valChar.dealloc = HB_FALSE;
    if( HB_PP_TOKEN_ALLOC( pToken->type ) )
    {
-      yylval_ptr->valChar.dealloc = ( HB_ULONG ) pToken->len != strlen( pToken->value );
+      yylval_ptr->valChar.dealloc = ( HB_SIZE ) pToken->len != strlen( pToken->value );
       pToken->value = hb_compIdentifierNew( HB_COMP_PARAM, pToken->value,
                yylval_ptr->valChar.dealloc ? HB_IDENT_COPY : HB_IDENT_FREE );
       if( !yylval_ptr->valChar.dealloc )
diff --git a/harbour/src/pp/pplib.c b/harbour/src/pp/pplib.c
index 4d1513e90b..77e0783c20 100644
--- a/harbour/src/pp/pplib.c
+++ b/harbour/src/pp/pplib.c
@@ -75,7 +75,7 @@ static void hb_pp_ErrorMessage( void * cargo, const char * szMsgTable[],
       PHB_ITEM pError;
       hb_snprintf( szMsgBuf, sizeof( szMsgBuf ), szMsgTable[ iCode - 1 ],
                    szParam1, szParam2 );
-      pError = hb_errRT_New( ES_ERROR, "PP", 1001, ( HB_ULONG ) iCode, szMsgBuf,
+      pError = hb_errRT_New( ES_ERROR, "PP", 1001, ( HB_ERRCODE ) iCode, szMsgBuf,
                              NULL, 0, EF_NONE | EF_CANDEFAULT );
       hb_errLaunch( pError );
       hb_errRelease( pError );