diff --git a/ChangeLog.txt b/ChangeLog.txt
index ab03f097e3..716cab68c6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,22 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-06-17 12:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/filesys.c
+    ! fixed FXO_TRUNCATE flag used without FXO_SHARELOCK in POSIX systems
+
+  * src/rtl/net.c
+    ! typo in variable name
+
+  * src/vm/task.c
+    ! variable scope
+
+  * src/compiler/compi18n.c
+    * minor variable type update
+
+  * ChangeLog.txt
+    ! formatting
+
 2015-06-02 13:31 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbtip/client.prg
     * eliminated hb_UserName() from initial random seed
@@ -779,7 +795,7 @@
 2015-02-19 13:09 UTC-0800 Pritpal Bedi (bedipritpal/at/hotmail.com)
   * contrib/gtwvg/gtwvgd.c
   * contrib/gtwvg/gtwgud.c
-    ! Fixed: a bug which was causing HB_GTI_SETPOS_XY/ROWCOL returning 
+    ! Fixed: a bug which was causing HB_GTI_SETPOS_XY/ROWCOL returning
       wrong values in case it is called as GET method.
 
 2015-02-19 20:20 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
@@ -1045,7 +1061,7 @@
          ENDIF
 
       It's not longer necessary to use SSL_set_fd() + SSL_connect()
-      and then SSL_read() / SSL_write() / hb_SSL_read_line() / 
+      and then SSL_read() / SSL_write() / hb_SSL_read_line() /
       hb_SSL_read_all().
       BTW hb_SSL_read_line() and hb_SSL_read_all() in HBSSL library
       are broken and have to be fixed.
@@ -1262,7 +1278,7 @@
 2014-12-30 01:19 UTC-0800 Pritpal Bedi (bedipritpal/at/hotmail.com)
   * src/rtl/memoedit.prg
     ! Fixed: nUdfReturn value ME_UNKEY (1-31) were not being processed.
- 
+
 2014-12-29 20:27 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * include/hbznet.h
   * src/rtl/hbinet.c
diff --git a/src/compiler/compi18n.c b/src/compiler/compi18n.c
index 101b52d780..4268c9344d 100644
--- a/src/compiler/compi18n.c
+++ b/src/compiler/compi18n.c
@@ -205,11 +205,11 @@ void hb_compI18nAddPlural( HB_COMP_DECL, const char ** szTexts, HB_ULONG ulCount
       for( ul = 1; ul < ulCount && pString->uiPlurals < HB_I18N_PLURAL_MAX; ++ul )
       {
          const char * szText = hb_compIdentifierNew( HB_COMP_PARAM, szTexts[ ul ], HB_IDENT_COPY );
-         HB_ULONG ulPlural;
+         HB_UINT uiPlural;
 
-         for( ulPlural = 0; ulPlural < pString->uiPlurals; ++ulPlural )
+         for( uiPlural = 0; uiPlural < pString->uiPlurals; ++uiPlural )
          {
-            if( pString->szPlurals[ ulPlural ] == szText )
+            if( pString->szPlurals[ uiPlural ] == szText )
             {
                szText = NULL;
                break;
diff --git a/src/rtl/filesys.c b/src/rtl/filesys.c
index 29bbe85911..f002dc08c1 100644
--- a/src/rtl/filesys.c
+++ b/src/rtl/filesys.c
@@ -3842,10 +3842,12 @@ HB_FHANDLE hb_fsExtOpen( const char * pszFileName, const char * pDefExt,
       uiFlags |= FO_CREAT;
       if( uiExFlags & FXO_UNIQUE )
          uiFlags |= FO_EXCL;
-#if ! defined( HB_USE_SHARELOCKS )
+#if defined( HB_USE_SHARELOCKS )
+      else if( ( uiExFlags & ( FXO_TRUNCATE | FXO_SHARELOCK ) ) == FXO_TRUNCATE )
+#else
       else if( uiExFlags & FXO_TRUNCATE )
-         uiFlags |= FO_TRUNC;
 #endif
+         uiFlags |= FO_TRUNC;
    }
 
    hFile = hb_fsOpen( szPath, uiFlags );
diff --git a/src/rtl/net.c b/src/rtl/net.c
index f0eeaeb648..08e16c96a9 100644
--- a/src/rtl/net.c
+++ b/src/rtl/net.c
@@ -137,8 +137,8 @@ char * hb_netname( void )
       szValue[ 0 ] = szValue[ 15 ] = '\0';
 
       regs.HB_XREGS.ax = 0x5E00;
-      regs.HB_XREGS.dx = FP_OFF( pszValue );
-      sregs.ds = FP_SEG( pszValue );
+      regs.HB_XREGS.dx = FP_OFF( szValue );
+      sregs.ds = FP_SEG( szValue );
 
       HB_DOS_INT86X( 0x21, &regs, &regs, &sregs );
 
diff --git a/src/vm/task.c b/src/vm/task.c
index 7c0168670d..91ad3dee95 100644
--- a/src/vm/task.c
+++ b/src/vm/task.c
@@ -734,11 +734,10 @@ void hb_taskSuspend( void )
 /* TODO: do not start task immediately */
 void hb_taskResume( void * pTaskPtr )
 {
-   PHB_TASKINFO pTask = ( PHB_TASKINFO ) pTaskPtr, pCurrTask;
+   PHB_TASKINFO pTask = ( PHB_TASKINFO ) pTaskPtr;
 
    if( s_currTask != pTask )
    {
-      pCurrTask = s_currTask;
       switch( pTask->state )
       {
 #if ! defined( HB_HAS_UCONTEXT )
@@ -763,9 +762,12 @@ void hb_taskResume( void * pTaskPtr )
             /* no break */
          case TASK_RUNNING:
 #if defined( HB_HAS_UCONTEXT )
-            s_currTask = pTask;
-            /* save current execution context and switch to the new one */
-            swapcontext( &pCurrTask->context, &pTask->context );
+            {
+               PHB_TASKINFO pCurrTask = s_currTask;
+               s_currTask = pTask;
+               /* save current execution context and switch to the new one */
+               swapcontext( &pCurrTask->context, &pTask->context );
+            }
 #else
             /* save current execution context */
             if( setjmp( s_currTask->context ) == 0 )