diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 662d30794e..f6dbc9d2b3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-04 17:28 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/hvm.c
+  * harbour/source/vm/mainstd.c
+    * force linking main() function in OpenWatcom OS2 builds
+
+  * harbour/contrib/xhb/hbcrypt.c
+    ! casting
+
 2008-11-04 13:06 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * include/hbextern.ch
    * common.mak
diff --git a/harbour/contrib/xhb/hbcrypt.c b/harbour/contrib/xhb/hbcrypt.c
index 85a3dee418..cc070d0f04 100644
--- a/harbour/contrib/xhb/hbcrypt.c
+++ b/harbour/contrib/xhb/hbcrypt.c
@@ -328,9 +328,9 @@ void nxs_xorcyclic(
    ULONG crc1l, crc2l, crc3l;
 
    /* Build the cyclic key seed */
-   crc1 = keylen >= 2 ? hb_adler32( 0, key + 0, keylen - 2 ) : 1;
-   crc2 = keylen >= 4 ? hb_adler32( 0, key + 2, keylen - 4 ) : 1;
-   crc3 = keylen >= 2 ? hb_adler32( 0, key + 1, keylen - 2 ) : 1;
+   crc1 = keylen >= 2 ? hb_adler32( 0, ( BYTE * ) key + 0, keylen - 2 ) : 1;
+   crc2 = keylen >= 4 ? hb_adler32( 0, ( BYTE * ) key + 2, keylen - 4 ) : 1;
+   crc3 = keylen >= 2 ? hb_adler32( 0, ( BYTE * ) key + 1, keylen - 2 ) : 1;
 
    crc1l = crc1 = nxs_cyclic_sequence( crc1 );
    crc2l = crc2 = nxs_cyclic_sequence( crc2 );
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 49f12f5ebf..94f9893b21 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -10874,7 +10874,7 @@ HB_LANG_REQUEST( HB_LANG_DEFAULT )
 
 #  define HB_FORCE_LINK_MAIN  hb_forceLinkMainWin
 
-#elif defined(HB_OS_LINUX) && defined(__WATCOMC__)
+#elif defined(__WATCOMC__) && ( defined(HB_OS_LINUX) || defined(HB_OS_OS2) )
 
 #  define HB_FORCE_LINK_MAIN  hb_forceLinkMainStd
 
diff --git a/harbour/source/vm/mainstd.c b/harbour/source/vm/mainstd.c
index 68ea27d5a0..2e6a251c30 100644
--- a/harbour/source/vm/mainstd.c
+++ b/harbour/source/vm/mainstd.c
@@ -77,7 +77,7 @@ char ** __crt0_glob_function( char * _arg )
 }
 #endif
 
-#if defined(HB_OS_LINUX) && defined(__WATCOMC__)
+#if defined(__WATCOMC__) && ( defined(HB_OS_LINUX) || defined(HB_OS_OS2) )
 HB_EXPORT void hb_forceLinkMainStd( void ) {}
 #endif