diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dff894bda5..a4fdfdfbf3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-15 22:42 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * src/rtl/teditor.prg
+    ! fixed typo in 2012-10-11 00:43 UTC+0200
+      Thanks to Rafal K for the report
+
+  * contrib/hbnf/calendar.prg
+    * minor
+
 2012-10-15 22:14 UTC+0200 Viktor Szakats (harbour syenar.net)
   * tests/tstgtapi.c
     ! fixed to compile with current GT API
diff --git a/harbour/contrib/hbnf/calendar.prg b/harbour/contrib/hbnf/calendar.prg
index 0cfe683804..062fef2c7e 100644
--- a/harbour/contrib/hbnf/calendar.prg
+++ b/harbour/contrib/hbnf/calendar.prg
@@ -85,7 +85,7 @@ FUNCTION FT_CALENDAR( nRow, nCol, cColor, lShadow, lShowHelp )
       CASE nKey == K_F1
          IF lShowHelp .AND. ! lHelpIsDisplayed
             lHelpIsDisplayed := .T.
-            cSaveHelp := SaveScreen ( nHelpRow - 1, 1, nHelpRow + 7, 80 )
+            cSaveHelp := SaveScreen( nHelpRow - 1, 1, nHelpRow + 7, 80 )
             FT_XBOX( "L", , , cColor, cColor, nHelpRow, 1, ;
                "Home, Up_Arrow or PgUp keys page by day, month or year to a past date.", ;
                "End, Dn_Arrow or PgDn keys page by day, month or year to a future date.", ;
diff --git a/harbour/src/rtl/teditor.prg b/harbour/src/rtl/teditor.prg
index 8e22c0c513..c49e5dc5a5 100644
--- a/harbour/src/rtl/teditor.prg
+++ b/harbour/src/rtl/teditor.prg
@@ -813,11 +813,11 @@ METHOD Edit( nPassedKey ) CLASS HBEditor
          CASE ::MoveCursor( nKey )
             // if it's a movement key ::MoveCursor() handles it
 
-         CASE K_CTRL_B
+         CASE nKey == K_CTRL_B
             /* TODO: Resolve keycode collision with K_CTRL_RIGHT */
             /* TODO: Implement reform paragraph */
 
-         CASE K_CTRL_T
+         CASE nKey == K_CTRL_T
             /* TODO: Implement delete word right */
 
          CASE nKey == K_ALT_W