diff --git a/src/servers/app/RootLayer.cpp b/src/servers/app/RootLayer.cpp
index 03ac87f689..682b1759a1 100644
--- a/src/servers/app/RootLayer.cpp
+++ b/src/servers/app/RootLayer.cpp
@@ -1234,10 +1234,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
 			// 4) int32 repeat count
 			// 5) int32 modifiers
 			// 6) int8[3] UTF-8 data generated
-			// 7) int8 number of bytes to follow containing the 
-			//		generated string
-			// 8) Character string generated by the keystroke
-			// 9) int8[16] state of all keys
+			// 7) Character string generated by the keystroke
+			// 8) int8[16] state of all keys
 			
 			bigtime_t time;
 			int32 scancode, modifiers;
@@ -1433,10 +1431,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
 			// 3) int32 modifier-independent ASCII code for the character
 			// 4) int32 modifiers
 			// 5) int8[3] UTF-8 data generated
-			// 6) int8 number of bytes to follow containing the 
-			//		generated string
-			// 7) Character string generated by the keystroke
-			// 8) int8[16] state of all keys
+			// 6) Character string generated by the keystroke
+			// 7) int8[16] state of all keys
 			
 			bigtime_t time;
 			int32 scancode, modifiers;
@@ -1567,10 +1563,7 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
 	
 			STRACE(("Unmapped Key Up: 0x%lx\n",scancode));
 			
-			Workspace *ws=ActiveWorkspace();
-			
-			WinBorder *target=ws->Focus();
-			if(target)
+			if(FocusWinBorder())
 			{
 				ServerWindow *win = FocusWinBorder()->Window();
 				if(win)