diff --git a/AppleWin/docs/History.txt b/AppleWin/docs/History.txt
index 5d175a84..9b26fb40 100644
--- a/AppleWin/docs/History.txt
+++ b/AppleWin/docs/History.txt
@@ -23,7 +23,7 @@ Changes:
 . Support cursor keys (in addition to numpad) when using keyboard for joystick emulation
 . Support auto-fire for all 3 joystick buttons (via Config->Input)
 . Debugger: Added "disk info" command
-. Added confirmation message box for reboot (F2)
+. [Feature #5668] Added confirmation message box for reboot (F2)
 . [Feature #5715] Added -no-printscreen-dlg to suppress the warning if AppleWin fails to capture the PrintScreen key
 . Changed save-state file persisted to Registry from filename to pathame
 Fixes:
@@ -34,7 +34,7 @@ Fixes:
 1.23.2 - 14 Sep 2013
 --------------------
 Changes:
-. Added About dialog showing GPL (at startup, but only when AppleWin version changes).
+. [Feature #5105] Added About dialog showing GPL (at startup, but only when AppleWin version changes).
 . [Bug #18940] Extend BSAVE and BLOAD Command To Memory Banks 0 and 1
 	Extended debugger BLOAD with bank support:
 	. BLOAD [file],[bank:]address[,length]
diff --git a/AppleWin/source/Joystick.cpp b/AppleWin/source/Joystick.cpp
index b2da2659..1d4a2d1d 100644
--- a/AppleWin/source/Joystick.cpp
+++ b/AppleWin/source/Joystick.cpp
@@ -671,9 +671,9 @@ BOOL JoySetEmulationType(HWND window, DWORD newtype, int nJoystickNumber, const
 	  {
 			MessageBox(window,
 						TEXT("Using cursor keys to emulate a joystick can cause conflicts.\n\n")
-						TEXT("Be aware that 'cursor up' = CTRL+K, and 'cursor-down' = CTRL+J.\n")
+						TEXT("Be aware that 'cursor-up' = CTRL+K, and 'cursor-down' = CTRL+J.\n")
 						TEXT("EG. Lode Runner uses CTRL+K/J to switch between keyboard/joystick modes ")
-						TEXT("(and cursor left/right to control speed).\n\n")
+						TEXT("(and cursor-left/right to control speed).\n\n")
 						TEXT("Also if cursor keys are blocked from being read from the Apple keyboard ")
 						TEXT("then even simple AppleSoft command-line editing (cursor left/right) will not work."),
 						TEXT("Configuration"),