diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index aeb882ff8..ee6b2bdc5 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-06  Sergey Okhapkin  <sos@prospect.com.ru>
+
+	* syscalls.cc (getutid): Use UT_IDLEN where appropriate.
+
 2002-11-06  Christopher Faylor  <cgf@redhat.com>
 
 	* include/cygwin/version.h: Bump API minor number for below export.
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 5be009eb9..6f55b7bee 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -1592,11 +1592,11 @@ static struct {
   {VK_END,	{"\033[4~",	"\033[4~",	"\033[4~",	"\033\033[4~"}},
   {VK_INSERT,	{"\033[2~",	"\033[2~",	"\033[2~",	"\033\033[2~"}},
   {VK_DELETE,	{"\033[3~",	"\033[3~",	"\033[3~",	"\033\033[3~"}},
-  {VK_F1,	{"\033[[A",	"\033[23~",	NULL,		NULL}},
-  {VK_F2,	{"\033[[B",	"\033[24~",	NULL,		NULL}},
-  {VK_F3,	{"\033[[C",	"\033[25~",	NULL,		NULL}},
-  {VK_F4,	{"\033[[D",	"\033[26~",	NULL,		NULL}},
-  {VK_F5,	{"\033[[E",	"\033[28~",	NULL,		NULL}},
+  {VK_F1,	{"\033[OP",	"\033[23~",	NULL,		NULL}},
+  {VK_F2,	{"\033[OQ",	"\033[24~",	NULL,		NULL}},
+  {VK_F3,	{"\033[OR",	"\033[25~",	NULL,		NULL}},
+  {VK_F4,	{"\033[OS",	"\033[26~",	NULL,		NULL}},
+  {VK_F5,	{"\033[15~",	"\033[28~",	NULL,		NULL}},
   {VK_F6,	{"\033[17~",	"\033[29~",	"\036",		NULL}},
   {VK_F7,	{"\033[18~",	"\033[31~",	NULL,		NULL}},
   {VK_F8,	{"\033[19~",	"\033[32~",	NULL,		NULL}},
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 24638606f..bfc45e722 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -2571,7 +2571,7 @@ getutid (struct utmp *id)
 	case LOGIN_PROCESS:
 	case USER_PROCESS:
 	case DEAD_PROCESS:
-   if (strncmp (id->ut_id, utmp_data.ut_id, 2) == 0)
+	   if (strncmp (id->ut_id, utmp_data.ut_id, UT_IDLEN) == 0)
 	    return &utmp_data;
 	  break;
 	default: