diff --git a/src/servers/input/BottomlineWindow.cpp b/src/servers/input/BottomlineWindow.cpp
index aebfb4c982..49dc457c4a 100644
--- a/src/servers/input/BottomlineWindow.cpp
+++ b/src/servers/input/BottomlineWindow.cpp
@@ -85,7 +85,7 @@ BottomlineWindow::HandleInputMethodEvent(BMessage* event, EventList& newEvents)
 		|| event->FindString("be:string", &string) != B_OK) 
 		return;
 
-	SERIAL_PRINT(("IME : %i, %s\n", opcode, string));
+	SERIAL_PRINT(("IME : %" B_PRId32 ", %s\n", opcode, string));
 	SERIAL_PRINT(("IME : confirmed\n"));
 
 	int32 length = strlen(string);
diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index 2cef3847d2..9ad4c7e431 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -10,6 +10,7 @@
 #include "MethodReplicant.h"
 
 #include <driver_settings.h>
+#include <keyboard_mouse_driver.h>
 #include <safemode_defs.h>
 #include <syscalls.h>
 
diff --git a/src/servers/input/MethodReplicant.cpp b/src/servers/input/MethodReplicant.cpp
index 18823ed67b..601b57aa2c 100644
--- a/src/servers/input/MethodReplicant.cpp
+++ b/src/servers/input/MethodReplicant.cpp
@@ -131,8 +131,8 @@ MethodReplicant::AttachedToWindow()
 void
 MethodReplicant::MessageReceived(BMessage* message)
 {
-	PRINT(("%s what:%c%c%c%c\n", __PRETTY_FUNCTION__, message->what >> 24,
-		message->what >> 16, message->what >> 8, message->what));
+	PRINT(("%s what:%c%c%c%c\n", __PRETTY_FUNCTION__, (char)(message->what >> 24),
+		(char)(message->what >> 16), (char)(message->what >> 8), (char)message->what));
 	PRINT_OBJECT(*message);
 
 	switch (message->what) {
diff --git a/src/servers/input/MouseSettings.cpp b/src/servers/input/MouseSettings.cpp
index df81cd3cd3..dca38b7f59 100644
--- a/src/servers/input/MouseSettings.cpp
+++ b/src/servers/input/MouseSettings.cpp
@@ -146,7 +146,7 @@ MouseSettings::Dump()
 	printf("mouse mode:\t%s\n", mode);
 
 	char *focus_follows_mouse_mode = "unknown";
-	switch (fMode) {
+	switch (fFocusFollowsMouseMode) {
 		case B_NORMAL_FOCUS_FOLLOWS_MOUSE:
 			focus_follows_mouse_mode = "normal";
 			break;