diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e43af5e88c..1b4d6979a6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-08 11:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/xhb/hbserv.c
+  * source/rtl/hbzlib.c
+  * source/rtl/transfrm.c
+  * source/rtl/version.c
+    % Using hb_retc_const() in some less obvious cases.
+
+  * source/vm/set.c
+    - Deleted explicit cast.
+
 2009-07-08 11:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * source/rtl/gtfunc.c
   * source/rtl/datec.c
diff --git a/harbour/contrib/xhb/hbserv.c b/harbour/contrib/xhb/hbserv.c
index ad323134d1..52e4fad533 100644
--- a/harbour/contrib/xhb/hbserv.c
+++ b/harbour/contrib/xhb/hbserv.c
@@ -948,7 +948,7 @@ HB_FUNC( HB_SIGNALDESC )
          case SEGV_MAPERR: hb_retc_const( "Segmentation fault: address not mapped to object"); return;
          case SEGV_ACCERR: hb_retc_const( "Segmentation fault: invalid permissions for mapped object"); return;
          #endif
-         default: hb_retc("Segmentation fault"); return;
+         default: hb_retc_const("Segmentation fault"); return;
       }
 
       case SIGILL: switch( iSubSig )
diff --git a/harbour/source/rtl/hbzlib.c b/harbour/source/rtl/hbzlib.c
index dae484f599..e15880dc2d 100644
--- a/harbour/source/rtl/hbzlib.c
+++ b/harbour/source/rtl/hbzlib.c
@@ -94,7 +94,7 @@ static ULONG hb_zlibUncompressedSize( const char * szSrc, ULONG ulLen )
 HB_FUNC( HB_ZLIBVERSION )
 {
    if( hb_parni( 1 ) == 1 )
-      hb_retc( ZLIB_VERSION );
+      hb_retc_const( ZLIB_VERSION );
    else
       hb_retc( zlibVersion() );
 }
diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c
index 63ba96baa5..d5faf44e9a 100644
--- a/harbour/source/rtl/transfrm.c
+++ b/harbour/source/rtl/transfrm.c
@@ -1014,7 +1014,7 @@ HB_FUNC( TRANSFORM )
       }
       else if( HB_IS_LOGICAL( pValue ) )
       {
-         hb_retc( hb_itemGetL( pValue ) ? "T" : "F" );
+         hb_retc_const( hb_itemGetL( pValue ) ? "T" : "F" );
       }
       else
          bError = TRUE;
diff --git a/harbour/source/rtl/version.c b/harbour/source/rtl/version.c
index 89fe24dcf4..36fd43a848 100644
--- a/harbour/source/rtl/version.c
+++ b/harbour/source/rtl/version.c
@@ -74,7 +74,7 @@ HB_FUNC( HB_VERSION )
    case HB_VERSION_MAJOR:          hb_retni( HB_VER_MAJOR ); break;
    case HB_VERSION_MINOR:          hb_retni( HB_VER_MINOR ); break;
    case HB_VERSION_RELEASE:        hb_retni( HB_VER_RELEASE ); break;
-   case HB_VERSION_STATUS:         hb_retc( HB_VER_STATUS ); break;
+   case HB_VERSION_STATUS:         hb_retc_const( HB_VER_STATUS ); break;
    case HB_VERSION_REVISION:       hb_retni( hb_verSvnID() ); break;
    case HB_VERSION_CHANGELOG_LAST: hb_retc_const( hb_verSvnLastEntry() ); break;
    case HB_VERSION_CHANGELOG_ID:   hb_retc_const( hb_verSvnChangeLogID() ); break;
diff --git a/harbour/source/vm/set.c b/harbour/source/vm/set.c
index 1fc6092967..658a312e1a 100644
--- a/harbour/source/vm/set.c
+++ b/harbour/source/vm/set.c
@@ -600,7 +600,7 @@ HB_FUNC( SET )
             pSet->HB_SET_CANCEL = set_logical( pArg2, pSet->HB_SET_CANCEL );
          break;
       case HB_SET_COLOR:
-         hb_retc( hb_conSetColor( args >= 2 && HB_IS_STRING( pArg2 ) ? hb_itemGetCPtr( pArg2 ) : ( char * ) NULL ) );
+         hb_retc( hb_conSetColor( args >= 2 && HB_IS_STRING( pArg2 ) ? hb_itemGetCPtr( pArg2 ) : NULL ) );
          break;
       case HB_SET_CONFIRM:
          hb_retl( pSet->HB_SET_CONFIRM );