diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f10f4f0ca4..0e77e9b89c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-22 16:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/vm/dynsym.c
+  * include/hbapi.h
+    * Minimal cleanup: using HB_LONG in place of long, just to make
+      this type usage easier to find in the future.
+
+  * src/vm/hvm.c
+    + Added cast to pacify long time msvc warning
+
+  * src/vm/fm.c
+    + Added pragmas to silence msvc64 warnings in dlmalloc (foreign) code.
+
+  * src/vm/extend.c
+    * Formatting.
+
 2010-06-22 16:49 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/rdd/dbcmd.c
     * changed HB_LONG to int in dbSelectArea()
diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h
index 5c9bfaad9b..68c5ee7918 100644
--- a/harbour/include/hbapi.h
+++ b/harbour/include/hbapi.h
@@ -1008,7 +1008,7 @@ extern HB_EXPORT PHB_DYNS  hb_dynsymFromNum( int iSymNum );
 #ifdef _HB_API_INTERNAL_
 extern           PHB_ITEM  hb_dynsymGetMemvar( PHB_DYNS pDynSym ); /* return memvar handle number bound with given dynamic symbol */
 extern           void      hb_dynsymSetMemvar( PHB_DYNS pDynSym, PHB_ITEM pMemvar ); /* set memvar handle for a given dynamic symbol */
-extern           long      hb_dynsymCount( void ); /* number of dynamic symbols */
+extern           HB_LONG   hb_dynsymCount( void ); /* number of dynamic symbols */
 #endif
 
 /* Symbol management */
diff --git a/harbour/src/vm/dynsym.c b/harbour/src/vm/dynsym.c
index 4fa709c370..d8faee2533 100644
--- a/harbour/src/vm/dynsym.c
+++ b/harbour/src/vm/dynsym.c
@@ -511,7 +511,7 @@ void hb_dynsymSetAreaHandle( PHB_DYNS pDynSym, int iArea )
    hb_dynsymHandles( pDynSym )->uiArea = ( HB_USHORT ) iArea;
 }
 
-static PHB_DYNS hb_dynsymGetByIndex( long lIndex )
+static PHB_DYNS hb_dynsymGetByIndex( HB_LONG lIndex )
 {
    PHB_DYNS pDynSym = NULL;
 
@@ -525,7 +525,7 @@ static PHB_DYNS hb_dynsymGetByIndex( long lIndex )
    return pDynSym;
 }
 
-long hb_dynsymCount( void )
+HB_LONG hb_dynsymCount( void )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_dynsymCount()"));
 
diff --git a/harbour/src/vm/extend.c b/harbour/src/vm/extend.c
index c92e50d551..def1d9ed74 100644
--- a/harbour/src/vm/extend.c
+++ b/harbour/src/vm/extend.c
@@ -386,7 +386,7 @@ double hb_partd( int iParam )
    return 0;
 }
 
-HB_BOOL hb_partdt( long * plJulian, long * plMilliSec , int iParam )
+HB_BOOL hb_partdt( long * plJulian, long * plMilliSec, int iParam )
 {
    HB_STACK_TLS_PRELOAD
 
@@ -1031,7 +1031,7 @@ double hb_parvtd( int iParam, ... )
    return 0;
 }
 
-HB_BOOL hb_parvtdt( long * plJulian, long * plMilliSec , int iParam, ... )
+HB_BOOL hb_parvtdt( long * plJulian, long * plMilliSec, int iParam, ... )
 {
    HB_STACK_TLS_PRELOAD
 
diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c
index d574b6f41f..14dadb1b03 100644
--- a/harbour/src/vm/fm.c
+++ b/harbour/src/vm/fm.c
@@ -185,6 +185,10 @@
 #        define ABORT TerminateProcess( GetCurrentProcess(), 0 )
 #        define LACKS_FCNTL_H
 #     endif
+#     if defined( HB_OS_WIN_64 )
+#        pragma warning( push )
+#        pragma warning( disable : 4267 )
+#     endif
 #  elif defined( __MINGW32__ )
 #     if !defined( USE_DL_PREFIX ) && !defined( HB_FM_DLMT_ALLOC )
 #        define USE_DL_PREFIX
@@ -209,6 +213,10 @@
 #     pragma warning 887 2
 #     pragma warning 887 2
 #     pragma enable_message ( 201 )
+#  elif defined( _MSC_VER )
+#     if defined( HB_OS_WIN_64 )
+#        pragma warning( pop )
+#     endif
 #  endif
 #  if defined( HB_FM_DLMT_ALLOC )
 #     define malloc( n )         mspace_malloc( hb_mspace(), ( n ) )
diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c
index cf8f6cd3d5..186abf70d2 100644
--- a/harbour/src/vm/hvm.c
+++ b/harbour/src/vm/hvm.c
@@ -10696,7 +10696,7 @@ HB_BOOL hb_xvmModulusByInt( HB_LONG lDivisor )
          }
       }
       else if( HB_IS_NUMINT( pValue ) )
-         hb_itemPutND( pValue, HB_ITEM_GET_NUMINTRAW( pValue ) % lDivisor );
+         hb_itemPutND( pValue, ( double ) ( HB_ITEM_GET_NUMINTRAW( pValue ) % lDivisor ) );
       else
          hb_itemPutND( pValue, fmod( hb_itemGetND( pValue ), lDivisor ) );