diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d11b3cf6cf..7a43a362ff 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-06 21:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/vm/hvm.c
+    ! Deleted one HB_ULONG cast in HB_SIZE context.
+    ! Changed hb_itemGetNL() to hb_itemGetNS().
+
 2010-07-06 21:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/vm/hashfunc.c
   * src/vm/macro.c
diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c
index f3c41b2577..79b9c415f2 100644
--- a/harbour/src/vm/hvm.c
+++ b/harbour/src/vm/hvm.c
@@ -5450,7 +5450,7 @@ static void hb_vmMacroPushIndex( void )
     * Now the top most element on the stack points to number of
     * additional indexes to generated array
     */
-   nIndexes = hb_itemGetNL( hb_stackItemFromTop( -1 ) ); /* TOFIX!!! */
+   nIndexes = hb_itemGetNS( hb_stackItemFromTop( -1 ) );
    hb_stackDec();
 
    if( nIndexes > 1 )
@@ -7828,7 +7828,8 @@ PHB_SYMBOLS hb_vmRegisterSymbols( PHB_SYMB pModuleSymbols, HB_USHORT uiSymbols,
 
       if( fClone )
       {
-         HB_SIZE nSymSize = ( HB_ULONG ) uiSymbols * sizeof( HB_SYMB ), nSize; /* TOFIX !!! */
+         HB_SIZE nSymSize = uiSymbols * sizeof( HB_SYMB );
+         HB_SIZE nSize;
          char * buffer;
 
          nSize = nSymSize;