diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ae7870f861..6366332fbd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-06-05 10:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/thread.c
+    * minor cleanup
+  * harbour/source/hbzlib/crc32.c
+    * casting
+
 2009-06-05 09:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Now if hbmk2 is renamed to a name which ends with '10',
diff --git a/harbour/source/hbzlib/crc32.c b/harbour/source/hbzlib/crc32.c
index 95a840c67f..eea71757e3 100644
--- a/harbour/source/hbzlib/crc32.c
+++ b/harbour/source/hbzlib/crc32.c
@@ -210,7 +210,7 @@ const unsigned long FAR * ZEXPORT get_crc_table( void )
     if (crc_table_empty)
         make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
+    return (const unsigned long FAR *)crc_table[0];
 }
 
 /* ========================================================================= */
diff --git a/harbour/source/vm/thread.c b/harbour/source/vm/thread.c
index 7ef0092222..ffb6c3e92a 100644
--- a/harbour/source/vm/thread.c
+++ b/harbour/source/vm/thread.c
@@ -1561,20 +1561,16 @@ void hb_threadMutexSyncSignal( PHB_ITEM pItemMtx )
       if( pMutex->waiters )
       {
          int iCount = pMutex->waiters;
-         ULONG ulLen;
 
-         if( pMutex->events )
+         if( !pMutex->events )
+            pMutex->events = hb_itemArrayNew( iCount );
+         else
          {
-            ulLen = hb_arrayLen( pMutex->events );
+            ULONG ulLen = hb_arrayLen( pMutex->events );
             iCount -= ulLen;
             if( iCount > 0 )
                hb_arraySize( pMutex->events, ulLen + iCount );
          }
-         else
-         {
-            ulLen = 0;
-            pMutex->events = hb_itemArrayNew( iCount );
-         }
          if( iCount == 1 )
             HB_COND_SIGNAL( pMutex->cond_w );
          else if( iCount > 0 )