diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ac3cc9a1eb..c9657570e0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-05 00:43 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * src/rtl/radiogrp.prg
+    % deleted '#include "common.ch"'
+
+  * contrib/hbtip/sessid.prg
+    ! playing it safe: using simple IF/ENDIF instead of HB_DEFAULT()
+      on a multi-type variable
+
+    ; NOTE: One more implication of HB_DEFAULT vs. DEFAULT ... TO ...
+            is that the default expression is always evaluated with
+            the former.
+
 2012-06-05 00:18 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib\hbblat\tests\blatcmd.prg
   * contrib\hbblat\tests\blattest.prg
diff --git a/harbour/contrib/hbtip/sessid.prg b/harbour/contrib/hbtip/sessid.prg
index c729a65bbc..c0d10facc1 100644
--- a/harbour/contrib/hbtip/sessid.prg
+++ b/harbour/contrib/hbtip/sessid.prg
@@ -60,8 +60,6 @@
  *
  */
 
-#include "common.ch"
-
 #define SID_LENGTH      25
 #define BASE_KEY_STRING "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 #define CRC_KEY_STRING  "Ak3yStR1Ng"  // Max Length must be 10 chars
diff --git a/harbour/src/rtl/radiogrp.prg b/harbour/src/rtl/radiogrp.prg
index a5b3ebd309..25f8f2edba 100644
--- a/harbour/src/rtl/radiogrp.prg
+++ b/harbour/src/rtl/radiogrp.prg
@@ -426,7 +426,10 @@ METHOD select( xValue ) CLASS RADIOGROUP
       FOR nPos := 1 TO nLen
          IF ::aItems[ nPos ]:data == xValue
 
-            hb_default( @::xBuffer, "" )
+            IF ::xBuffer == NIL
+               ::xBuffer := ""
+            ENDIF
+
             ::changeButton( ::nValue, nPos )
 
             EXIT
@@ -439,7 +442,10 @@ METHOD select( xValue ) CLASS RADIOGROUP
 
    ELSEIF cType == "N" .AND. xValue >= 1 .AND. xValue <= ::nItemCount
 
-      hb_default( @::xBuffer, 0 )
+      IF ::xBuffer == NIL
+         ::xBuffer := 0
+      ENDIF
+
       ::changeButton( ::nValue, xValue )
 
    ENDIF