diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f9d4a08a7f..cceae61615 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-09 21:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbdefs.h
+    + Added more info on HB_SIZE/HB_ISIZ future plans.
+
+  * contrib/hbmemio/memio.c
+  * contrib/hbnetio/netiocli.c
+    - Deleted ( HB_SIZE ) casts in more obscure places.
+
+  * utils/hbmk2/hbmk2.prg
+    + -hbnolib option is now automatically enabled in -hbdyn mode.
+      To disable it anyway, -hbnolib- option can be used.
+
 2010-02-09 08:38 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/hbide.ch
   * contrib/hbide/hbide.prg
@@ -31,7 +43,7 @@
     + Implemented multiple views.
       How it works:
         * Select "New..." from drop-down menu of "Views" combo-box in toolbar.
-        * An input dialog opens, provide a useful name, 
+        * An input dialog opens, provide a useful name,
              keep it "one word" if possible
         * Press <ENTER> or click "Ok", a blank edit area will come-up.
         * Make ususal operations to add/delete/move sources.
diff --git a/harbour/contrib/hbmemio/memio.c b/harbour/contrib/hbmemio/memio.c
index 33233cba86..2b73a167da 100644
--- a/harbour/contrib/hbmemio/memio.c
+++ b/harbour/contrib/hbmemio/memio.c
@@ -692,7 +692,7 @@ static PHB_FILE s_fileNew( HB_FHANDLE hFile );
 
 static HB_BOOL s_fileAccept( const char * pFilename )
 {
-   return hb_strnicmp( pFilename, FILE_PREFIX, ( HB_SIZE ) FILE_PREFIX_LEN ) == 0;
+   return hb_strnicmp( pFilename, FILE_PREFIX, FILE_PREFIX_LEN ) == 0;
 }
 
 
diff --git a/harbour/contrib/hbnetio/netiocli.c b/harbour/contrib/hbnetio/netiocli.c
index 85b09be21a..ac429aa2dc 100644
--- a/harbour/contrib/hbnetio/netiocli.c
+++ b/harbour/contrib/hbnetio/netiocli.c
@@ -882,7 +882,7 @@ HB_FUNC( NETIO_FUNCEXEC )
  */
 static HB_BOOL s_fileAccept( const char * pFilename )
 {
-   return hb_strnicmp( pFilename, NETIO_FILE_PREFIX, ( HB_SIZE ) NETIO_FILE_PREFIX_LEN ) == 0;
+   return hb_strnicmp( pFilename, NETIO_FILE_PREFIX, NETIO_FILE_PREFIX_LEN ) == 0;
 }
 
 static HB_BOOL s_fileExists( const char * pFilename, char * pRetPath )
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 3fc5787a5e..36875da3a5 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -191,8 +191,8 @@ typedef long                HB_LONG;           /* WARNING: These types have a ne
 typedef unsigned long       HB_ULONG;          /* WARNING: These types have a new size in Harbour 2.1.x and upper. */
 typedef int                 HB_INT;
 typedef unsigned int        HB_UINT;
-typedef unsigned long       HB_SIZE;           /* TODO: Currently 'unsigned long', to be changed to 'long' */
-typedef long                HB_ISIZ;           /* TODO: Change to HB_SIZE, after HB_SIZE has been converted to 'long'. TEMPORARY type. */
+typedef unsigned long       HB_SIZE;           /* TODO: Currently 'unsigned long', to be changed to HB_LONGLONG on win64, long on other systems */
+typedef long                HB_ISIZ;           /* TODO: Change to HB_SIZE, after HB_SIZE has been converted to signed type. TEMPORARY type. */
 
 /* Guaranteed 8-bit types */
 typedef HB_SCHAR            HB_I8;
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 2de34836a5..173a39305b 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1576,7 +1576,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
       CASE cParamL == "-pause"           ; lPause := .T.
       CASE cParamL == "-hbexe"           ; hbmk[ _HBMK_lInfo ] := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .F. ; hbmk[ _HBMK_lCreateLib ] := .F. ; hbmk[ _HBMK_lCreateDyn ] := .F.
       CASE cParamL == "-hblib"           ; hbmk[ _HBMK_lInfo ] := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .T. ; hbmk[ _HBMK_lCreateDyn ] := .F.
-      CASE cParamL == "-hbdyn"           ; hbmk[ _HBMK_lInfo ] := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .F. ; hbmk[ _HBMK_lCreateDyn ] := .T.
+      CASE cParamL == "-hbdyn"           ; hbmk[ _HBMK_lInfo ] := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T. ; hbmk[ _HBMK_lCreateLib ] := .F. ; hbmk[ _HBMK_lCreateDyn ] := .T. ; l_lNOHBLIB := .T.
       CASE cParamL == "-gui" .OR. ;
            cParamL == "-mwindows"        ; hbmk[ _HBMK_lGUI ]       := .T. /* Compatibility */
       CASE cParamL == "-std" .OR. ;