diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fa77deb27c..828116d424 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-17 13:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/achoice.prg
+    + Added TOFIX.
+
+  * src/rtl/hbrandom.c
+    ! Fixed type and initialization of a variable.
+
+  * utils/hbmk2/hbmk2.prg
+    * Formatting.
+
 2011-02-17 10:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/hbrandom.c
     ! Typo in comment. [Tamas]
diff --git a/harbour/src/rtl/achoice.prg b/harbour/src/rtl/achoice.prg
index 0576ee897e..bc1bf1726e 100644
--- a/harbour/src/rtl/achoice.prg
+++ b/harbour/src/rtl/achoice.prg
@@ -11,6 +11,15 @@
  *
  */
 
+/* TOFIX:
+   ---
+   #include "inkey.ch"
+   CLS
+   KEYBOARD Chr( K_DOWN ) + Chr( K_UP ) // bogus '2' appears out of the area here.
+   AChoice( 0, 0, 0, 0, { "1", "2" } )
+   ---
+ */
+
 #include "achoice.ch"
 #include "color.ch"
 #include "common.ch"
diff --git a/harbour/src/rtl/hbrandom.c b/harbour/src/rtl/hbrandom.c
index b3c8a62771..69f38572c1 100644
--- a/harbour/src/rtl/hbrandom.c
+++ b/harbour/src/rtl/hbrandom.c
@@ -57,7 +57,7 @@
 #include <float.h>
 
 /* Globally available data, no need to MT it */
-static volatile int s_fInit = 0;
+static volatile HB_BOOL s_fInit = HB_FALSE;
 
 /*
  * HB_RANDOM
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b07f4cb844..9d51090634 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7282,7 +7282,6 @@ STATIC FUNCTION checkDepTime( hbmk, cFile, tTime )
 
    RETURN .F.
 
-
 STATIC FUNCTION clpfile_read( cFileName )
    LOCAL cFileBody := MemoRead( cFileName )
    LOCAL aFiles