diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b5f36287d3..04c9050327 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-05-31 23:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/compiler/harbour.yyc
+    * synced with recent modifications in harbour.y - I missed it.
+  * harbour/source/hbpcre/pcrecomp.c
+    * cleaned some waning reported by Lorenzo
+
 2007-05-31 21:25 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/common.mak
   * harbour/makefile.vc
diff --git a/harbour/source/compiler/harbour.yyc b/harbour/source/compiler/harbour.yyc
index 8e384acdd7..2763d7fcb4 100644
--- a/harbour/source/compiler/harbour.yyc
+++ b/harbour/source/compiler/harbour.yyc
@@ -712,10 +712,10 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      118,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,   106,   113,   116,     2,
+       2,     2,     2,     2,     2,     2,   108,   113,   116,     2,
      121,   122,   111,   109,   120,   110,     2,   112,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,   125,   119,
-     107,   105,   108,     2,   117,     2,     2,     2,     2,     2,
+     106,   105,   107,     2,   117,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,   127,     2,   126,     2,     2,     2,     2,     2,     2,
@@ -929,9 +929,9 @@ static const yytype_int16 yyrhs[] =
       -1,   219,   111,   219,    -1,   219,   112,   219,    -1,   219,
      113,   219,    -1,   219,    58,   219,    -1,   219,    27,   219,
       -1,   219,    28,   219,    -1,   219,    31,   219,    -1,   219,
-     107,   219,    -1,   219,   108,   219,    -1,   219,    49,   219,
+     106,   219,    -1,   219,   107,   219,    -1,   219,    49,   219,
       -1,   219,    50,   219,    -1,   219,    32,   219,    -1,   219,
-      33,   219,    -1,   219,   106,   219,    -1,   219,   105,   219,
+      33,   219,    -1,   219,   108,   219,    -1,   219,   105,   219,
       -1,   243,   126,    -1,   127,   222,    -1,   243,   120,   222,
       -1,   243,   126,   127,   222,    -1,   206,    -1,   244,   120,
      206,    -1,    -1,    95,   246,   247,   128,    -1,    -1,   102,
@@ -1097,7 +1097,7 @@ static const char *const yytname[] =
   "AS_DATE_ARRAY", "AS_LOGICAL_ARRAY", "AS_NUMERIC_ARRAY",
   "AS_OBJECT_ARRAY", "PROCREQ", "CBSTART", "DOIDENT", "FOREACH", "DESCEND",
   "DOSWITCH", "WITHOBJECT", "NUM_DATE", "EPSILON", "HASHOP", "POST", "'='",
-  "'$'", "'<'", "'>'", "'+'", "'-'", "'*'", "'/'", "'%'", "UNARY", "PRE",
+  "'<'", "'>'", "'$'", "'+'", "'-'", "'*'", "'/'", "'%'", "UNARY", "PRE",
   "'&'", "'@'", "'\\n'", "';'", "','", "'('", "')'", "'{'", "'}'", "':'",
   "']'", "'['", "'|'", "$accept", "Main", "Source", "Line", "Function",
   "@1", "@2", "@3", "@4", "FunScope", "Params", "AsType", "AsArrayType",
@@ -1157,7 +1157,7 @@ static const yytype_uint16 yytoknum[] =
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,    61,    36,    60,    62,    43,
+     355,   356,   357,   358,   359,    61,    60,    62,    36,    43,
       45,    42,    47,    37,   360,   361,    38,    64,    10,    59,
       44,    40,    41,   123,   125,    58,    93,    91,   124
 };
@@ -1371,7 +1371,7 @@ static const yytype_uint16 yydefact[] =
        0,   113,     0,     0,   532,   519,     0,   538,   520,   540,
        0,   586,     0,   584,    79,     0,   437,    36,     0,     0,
      424,   426,   309,   272,   303,   283,   287,   290,   387,   388,
-     389,   394,   395,   392,   393,   386,   397,   396,   390,   391,
+     389,   394,   395,   392,   393,   386,   397,   390,   391,   396,
      381,   382,   383,   384,   385,   507,   305,    92,   117,   119,
      434,    36,     0,     0,   455,     0,   454,   546,   449,     0,
        0,     0,   428,     0,     0,   590,    74,   605,     0,    16,
diff --git a/harbour/source/hbpcre/pcrecomp.c b/harbour/source/hbpcre/pcrecomp.c
index b098d16cd0..ae4084bfd3 100644
--- a/harbour/source/hbpcre/pcrecomp.c
+++ b/harbour/source/hbpcre/pcrecomp.c
@@ -572,11 +572,11 @@ int c, i, bot, top;
 const uschar *ptr = *ptrptr;
 char name[4];
 
+*negptr = FALSE;
+
 c = *(++ptr);
 if (c == 0) goto ERROR_RETURN;
 
-*negptr = FALSE;
-
 /* \P or \p can be followed by a one- or two-character name in {}, optionally
 preceded by ^ for negation. */
 
@@ -3876,6 +3876,7 @@ const uschar *ptr;
 compile_data compile_block;
 int brastack[BRASTACK_SIZE];
 uschar bralenstack[BRASTACK_SIZE];
+int min = 0, max = 0;      /* To please picky compilers */
 
 /* We can't pass back an error message if errorptr is NULL; I guess the best we
 can do is just return NULL, but we can set a code value if there is a code
@@ -3955,7 +3956,6 @@ pattern. We can't be so clever for #-comments. */
 ptr = (const uschar *)(pattern - 1);
 while ((c = *(++ptr)) != 0)
   {
-  int min, max;
   int class_optcount;
   int bracket_length;
   int duplength;