diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 603f725d72..8522461df3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-14 00:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/compiler/complex.c
+    ! added casting to unsigned char to force syntax error when
+      some unknown tokens appear. Negative values bison recognizes
+      as end of input.
+
+  * harbour/contrib/rddads/adsmgmnt.c
+    ! cleaned one warning
+
 2008-05-13 11:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/xhb/txml.prg
     ! fixed wrongly defined scopes. Note: during porting xHarbour code
diff --git a/harbour/contrib/rddads/adsmgmnt.c b/harbour/contrib/rddads/adsmgmnt.c
index 4190b1e80b..ef95cede30 100644
--- a/harbour/contrib/rddads/adsmgmnt.c
+++ b/harbour/contrib/rddads/adsmgmnt.c
@@ -278,7 +278,7 @@ HB_FUNC( ADSMGGETCOMMSTATS )
 
 HB_FUNC( ADSMGRESETCOMMSTATS )
 {
-   hb_retnl( s_hMgmtHandle ? AdsMgResetCommStats( s_hMgmtHandle ) : -1 );
+   hb_retnl( s_hMgmtHandle ? ( LONG ) AdsMgResetCommStats( s_hMgmtHandle ) : -1 );
 }
 
 HB_FUNC( ADSMGGETCONFIGINFO )
diff --git a/harbour/source/compiler/complex.c b/harbour/source/compiler/complex.c
index b80022880b..e729647f4c 100644
--- a/harbour/source/compiler/complex.c
+++ b/harbour/source/compiler/complex.c
@@ -684,7 +684,7 @@ int hb_complex( YYSTYPE *yylval_ptr, HB_COMP_DECL )
             return IDENTIFIER;
          }
          pLex->iState = OPERATOR;
-         return pToken->value[ 0 ];
+         return ( UCHAR ) pToken->value[ 0 ];
 
       case HB_PP_TOKEN_EQ:
          if( HB_SUPPORT_HARBOUR && pToken->pNext && pToken->pNext->spaces == 0 &&
@@ -709,13 +709,13 @@ int hb_complex( YYSTYPE *yylval_ptr, HB_COMP_DECL )
       case HB_PP_TOKEN_GT:
       case HB_PP_TOKEN_REFERENCE:
          pLex->iState = OPERATOR;
-         return pToken->value[ 0 ];
+         return ( UCHAR ) pToken->value[ 0 ];
 
       case HB_PP_TOKEN_EOL:
          pLex->fEol = TRUE;
       case HB_PP_TOKEN_EOC:
          pLex->iState = LOOKUP;
-         return pToken->value[ 0 ];
+         return ( UCHAR ) pToken->value[ 0 ];
 
       case HB_PP_TOKEN_KEYWORD:
       {
@@ -1311,7 +1311,7 @@ int hb_complex( YYSTYPE *yylval_ptr, HB_COMP_DECL )
          return iType;
       }
       default:
-         return pToken->value[ 0 ];
+         return ( UCHAR ) pToken->value[ 0 ];
    }
 }